From 9f4c2607d8d132c0b5dd995e07d5ab31e784149e Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 11:14:17 +0200 Subject: [PATCH 01/40] KV --- src/assetchains | 13 +------------ src/dpowassets | 1 + src/fiat-cli | 1 + src/fiat/kv | 2 ++ 4 files changed, 5 insertions(+), 12 deletions(-) create mode 100755 src/fiat/kv diff --git a/src/assetchains b/src/assetchains index f1acd3601..ebd732782 100755 --- a/src/assetchains +++ b/src/assetchains @@ -4,30 +4,19 @@ source pubkey.txt echo $pubkey ./komodod -pubkey=$pubkey -ac_name=REVS -ac_supply=1300000 -addnode=78.47.196.146 $1 -gen & -sleep 10 ./komodod -pubkey=$pubkey -ac_name=SUPERNET -ac_supply=816061 -addnode=78.47.196.146 $1 -gen & -sleep 10 ./komodod -pubkey=$pubkey -ac_name=DEX -ac_supply=999999 -addnode=78.47.196.146 $1 -gen & -sleep 10 ./komodod -pubkey=$pubkey -ac_name=PANGEA -ac_supply=999999 -addnode=78.47.196.146 $1 -gen & -sleep 10 ./komodod -pubkey=$pubkey -ac_name=JUMBLR -ac_supply=999999 -addnode=78.47.196.146 $1 -gen & -sleep 10 ./komodod -pubkey=$pubkey -ac_name=BET -ac_supply=999999 -addnode=78.47.196.146 $1 -gen & -sleep 10 ./komodod -pubkey=$pubkey -ac_name=CRYPTO -ac_supply=999999 -addnode=78.47.196.146 $1 -gen & -sleep 10 ./komodod -pubkey=$pubkey -ac_name=HODL -ac_supply=9999999 -addnode=78.47.196.146 $1 -gen & -sleep 10 ./komodod -pubkey=$pubkey -ac_name=SHARK -ac_supply=1401 -addnode=78.47.196.146 $1 -gen & -sleep 10 ./komodod -pubkey=$pubkey -ac_name=BOTS -ac_supply=999999 -addnode=78.47.196.146 $1 -gen & -sleep 10 ./komodod -pubkey=$pubkey -ac_name=MGW -ac_supply=999999 -addnode=78.47.196.146 $1 -gen & -sleep 10 ./komodod -pubkey=$pubkey -ac_name=MVP -ac_supply=1000000 -addnode=78.47.196.146 $1 -gen & -sleep 10 ./komodod -pubkey=$pubkey -ac_name=WIRELESS -ac_supply=21000000 -addnode=78.47.196.146 $1 -gen & +./komodod -pubkey=$pubkey -ac_name=KV -ac_supply=1000000 -addnode=78.47.196.146 $1 -gen & sleep 10 ./komodod -pubkey=$pubkey -ac_name=USD -addnode=78.47.196.146 $1 -gen & diff --git a/src/dpowassets b/src/dpowassets index 9e11bfde4..03e489864 100755 --- a/src/dpowassets +++ b/src/dpowassets @@ -18,6 +18,7 @@ curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dp curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"MGW\",\"pubkey\":\"$pubkey\"}" curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"MVP\",\"pubkey\":\"$pubkey\"}" curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"WIRELESS\",\"pubkey\":\"$pubkey\"}" +curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"KV\",\"pubkey\":\"$pubkey\"}" curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"USD\",\"pubkey\":\"$pubkey\"}" curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"EUR\",\"pubkey\":\"$pubkey\"}" diff --git a/src/fiat-cli b/src/fiat-cli index 16e121244..f88958d31 100755 --- a/src/fiat-cli +++ b/src/fiat-cli @@ -45,3 +45,4 @@ echo bots; fiat/bots $1 $2 $3 $4 echo mgw; fiat/mgw $1 $2 $3 $4 echo mvp; fiat/mvp $1 $2 $3 $4 echo wireless; fiat/wireless $1 $2 $3 $4 +echo kv; fiat/kv $1 $2 $3 $4 diff --git a/src/fiat/kv b/src/fiat/kv new file mode 100755 index 000000000..c735138e3 --- /dev/null +++ b/src/fiat/kv @@ -0,0 +1,2 @@ +#!/bin/bash +./komodo-cli -ac_name=KV $1 $2 $3 $4 From 15d0fbd4079a213d648687aa945ddc8618af0450 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 19:57:12 +0200 Subject: [PATCH 02/40] test --- src/komodo.h | 7 ++++++- src/komodo_gateway.h | 45 +++++++++++++++++++++++++++++++++++++++++++- src/komodo_globals.h | 4 ++++ src/komodo_structs.h | 2 ++ 4 files changed, 56 insertions(+), 2 deletions(-) diff --git a/src/komodo.h b/src/komodo.h index 9fe331708..e1c62bfa8 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -187,8 +187,13 @@ int32_t komodo_parsestatefile(struct komodo_state *sp,FILE *fp,char *symbol,char void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotaries,uint8_t notaryid,uint256 txhash,uint64_t voutmask,uint8_t numvouts,uint32_t *pvals,uint8_t numpvals,int32_t KMDheight,uint32_t KMDtimestamp,uint64_t opretvalue,uint8_t *opretbuf,uint16_t opretlen,uint16_t vout) { - static FILE *fp; static int32_t errs; + static FILE *fp; static int32_t errs,didinit; struct komodo_state *sp; char fname[512],symbol[16],dest[16]; int32_t ht,func; uint8_t num,pubkeys[64][33]; + if ( didinit == 0 ) + { + portable_mutex_init(&KOMODO_KV_mutex); + didinit = 1; + } if ( (sp= komodo_stateptr(symbol,dest)) == 0 ) { KOMODO_INITDONE = (uint32_t)time(NULL); diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 007b16b0b..304315104 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -671,6 +671,20 @@ int32_t komodo_check_deposit(int32_t height,const CBlock& block) // verify above return(0); } +int32_t komodo_kvsearch(uint8_t value[IGUANA_MAXSCRIPTSIZE],uint8_t *key,int32_t keylen) +{ + struct komodo_kv *ptr; int32_t retval = -1; + portable_mutex_lock(&KOMODO_KV_mutex); + HASH_FIND(hh,KOMODO_KV,key,keylen,ptr); + if ( ptr != 0 ) + { + if ( (retval= ptr->valuesize) != 0 ) + memcpy(value,ptr->value,retval); + } + portable_mutex_unlock(&KOMODO_KV_mutex); + return(retval); +} + const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int32_t opretlen,uint256 txid,uint16_t vout,char *source) { uint8_t rmd160[20],rmd160s[64*20],addrtype,shortflag,pubkey33[33]; int32_t didstats,i,j,n,len,tokomodo,kmdheight,otherheights[64],kmdheights[64]; int8_t baseids[64]; char base[4],coinaddr[64],destaddr[64]; uint256 txids[64]; uint16_t vouts[64]; uint64_t convtoshis,seed; int64_t fiatoshis,komodoshis,checktoshis,values[64],srcvalues[64]; struct pax_transaction *pax,*pax2; struct komodo_state *basesp; double diff; @@ -689,7 +703,36 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 memset(kmdheights,0,sizeof(kmdheights)); memset(otherheights,0,sizeof(otherheights)); tokomodo = (komodo_is_issuer() == 0); - if ( opretbuf[0] == 'D' ) + if ( opretbuf[0] == 'K' ) + { + uint16_t keylen,valuesize; uint8_t *key,*value; struct komodo_kv *ptr; + iguana_rwnum(0,&opretbuf[1],sizeof(keylen),&keylen); + iguana_rwnum(0,&opretbuf[3],sizeof(valuesize),&valuesize); + key = &opretbuf[5]; + value = &key[keylen]; + if ( sizeof(keylen)+sizeof(valuesize)+keylen+valuesize+1 == opretlen ) + { + portable_mutex_lock(&KOMODO_KV_mutex); + HASH_FIND(hh,KOMODO_KV,key,keylen,ptr); + if ( ptr == 0 ) + { + ptr = calloc(1,sizeof(*ptr)); + ptr->key = calloc(1,keylen); + ptr->keylen = keylen; + memcpy(ptr->key,key,keylen); + HASH_ADD_KEYPTR(hh,KOMODO_KV,ptr->key,ptr->keylen,ptr); + } + if ( ptr->value != 0 ) + free(ptr->value), ptr->value = 0; + if ( (ptr->valuesize= valuesize) != 0 ) + { + ptr->value = calloc(1,valuesize); + memcpy(ptr->value,value,valuesize); + } + portable_mutex_unlock(&KOMODO_KV_mutex); + } else printf("opretlen.%d mismatch keylen.%d valuesize.%d\n",opretln,keylen,valuesize); + } + else if ( opretbuf[0] == 'D' ) { tokomodo = 0; if ( opretlen == 38 ) // any KMD tx diff --git a/src/komodo_globals.h b/src/komodo_globals.h index 08c80ff79..71d62eac1 100644 --- a/src/komodo_globals.h +++ b/src/komodo_globals.h @@ -27,6 +27,7 @@ int32_t komodo_longestchain(); pthread_mutex_t komodo_mutex; #define KOMODO_ELECTION_GAP 2000 //((ASSETCHAINS_SYMBOL[0] == 0) ? 2000 : 100) +#define IGUANA_MAXSCRIPTSIZE 10001 struct pax_transaction *PAX; int32_t NUM_PRICES; uint32_t *PVALS; @@ -49,3 +50,6 @@ uint64_t ASSETCHAINS_SUPPLY = 10; uint32_t KOMODO_INITDONE; char KMDUSERPASS[4096],BTCUSERPASS[4096]; uint16_t BITCOIND_PORT = 7771; uint64_t PENDING_KOMODO_TX; + +struct komodo_kv *KOMODO_KV; +portable_mutex_t KOMODO_KV_mutex; \ No newline at end of file diff --git a/src/komodo_structs.h b/src/komodo_structs.h index d1da1d4c4..2bb827849 100644 --- a/src/komodo_structs.h +++ b/src/komodo_structs.h @@ -37,6 +37,8 @@ #define KOMODO_OPRETURN_WITHDRAW 'W' // assetchain #define KOMODO_OPRETURN_REDEEMED 'X' +struct komodo_kv { UT_hash_handle hh; uint8_t *key,*value; uint16_t keylen,valuesize; }; + struct komodo_event_notarized { uint256 blockhash,desttxid; int32_t notarizedheight; char dest[16]; }; struct komodo_event_pubkeys { uint8_t num; uint8_t pubkeys[64][33]; }; struct komodo_event_opreturn { uint256 txid; uint64_t value; uint16_t vout,oplen; uint8_t opret[]; }; From 313b7381a9cecac57a21f3c1753fe9183ee0bee1 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 20:00:34 +0200 Subject: [PATCH 03/40] test --- src/komodo_gateway.h | 6 +++--- src/komodo_globals.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 304315104..0ee5d1011 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -716,7 +716,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 HASH_FIND(hh,KOMODO_KV,key,keylen,ptr); if ( ptr == 0 ) { - ptr = calloc(1,sizeof(*ptr)); + ptr = (struct komodo_kv *)calloc(1,sizeof(*ptr)); ptr->key = calloc(1,keylen); ptr->keylen = keylen; memcpy(ptr->key,key,keylen); @@ -726,11 +726,11 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 free(ptr->value), ptr->value = 0; if ( (ptr->valuesize= valuesize) != 0 ) { - ptr->value = calloc(1,valuesize); + ptr->value = (uint8_t *)calloc(1,valuesize); memcpy(ptr->value,value,valuesize); } portable_mutex_unlock(&KOMODO_KV_mutex); - } else printf("opretlen.%d mismatch keylen.%d valuesize.%d\n",opretln,keylen,valuesize); + } else printf("opretlen.%d mismatch keylen.%d valuesize.%d\n",opretlen,keylen,valuesize); } else if ( opretbuf[0] == 'D' ) { diff --git a/src/komodo_globals.h b/src/komodo_globals.h index 71d62eac1..a63c4c754 100644 --- a/src/komodo_globals.h +++ b/src/komodo_globals.h @@ -52,4 +52,4 @@ char KMDUSERPASS[4096],BTCUSERPASS[4096]; uint16_t BITCOIND_PORT = 7771; uint64_t PENDING_KOMODO_TX; struct komodo_kv *KOMODO_KV; -portable_mutex_t KOMODO_KV_mutex; \ No newline at end of file +pthread_mutex_t KOMODO_KV_mutex; \ No newline at end of file From e77a3b30d2fb2abe2cc9a665229635e84d550216 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 20:01:40 +0200 Subject: [PATCH 04/40] test --- src/komodo_gateway.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 0ee5d1011..0cac2631e 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -717,7 +717,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 if ( ptr == 0 ) { ptr = (struct komodo_kv *)calloc(1,sizeof(*ptr)); - ptr->key = calloc(1,keylen); + ptr->key = (uint8_t *)calloc(1,keylen); ptr->keylen = keylen; memcpy(ptr->key,key,keylen); HASH_ADD_KEYPTR(hh,KOMODO_KV,ptr->key,ptr->keylen,ptr); From d20fb2db484433e03f8e8d0662dd26b4fe240acd Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 20:18:31 +0200 Subject: [PATCH 05/40] test --- src/rpcblockchain.cpp | 27 +++++++++++++++++++++++++++ src/rpcclient.cpp | 1 + src/rpcserver.cpp | 1 + src/rpcserver.h | 1 + 4 files changed, 30 insertions(+) diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 62ac42675..dc0218e5b 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -404,6 +404,33 @@ int32_t komodo_notaries(uint8_t pubkeys[64][33],int32_t height); char *bitcoin_address(char *coinaddr,uint8_t addrtype,uint8_t *pubkey_or_rmd160,int32_t len); uint32_t komodo_interest_args(int32_t *txheightp,uint32_t *tiptimep,uint64_t *valuep,uint256 hash,int32_t n); int32_t komodo_minerids(uint8_t *minerids,int32_t height); +int32_t komodo_kvsearch(uint8_t value[IGUANA_MAXSCRIPTSIZE],uint8_t *key,int32_t keylen); + +Value kvsearch(const Array& params, bool fHelp) +{ + Object ret; uint8_t value[IGUANA_MAXSCRIPTSIZE],key[IGUANA_MAXSCRIPTSIZE]; int32_t j,valuesize,keylen; + LOCK(cs_main); + if ( (keylen= (int32_t)strlen(params[0].get_str().c_str())) > 0 ) + { + if ( keylen < sizeof(key) ) + { + memcpy(key,params[0].get_str().c_str(),keylen); + if ( (valuesize= komodo_kvsearch(value,key,keylen)) >= 0 ) + { + std::string value; char *valuestr; int32_t m; + value.resize(valuesize+1); + hexstr = (char *)value.data(); + memcpy(valuestr,value,valuesize); + valuestr[valuesize] = 0; + ret.push_back(Pair("coin",(char *)(ASSETCHAINS_SYMBOL[0] == 0 ? "KMD" : ASSETCHAINS_SYMBOL))); + ret.push_back(Pair("key",params[0].get_str())); + ret.push_back(Pair("value",value)); + ret.push_back(Pair("height", (int64_t)chainActive.Tip()->nHeight)); + } else ret.push_back(Pair("error",(char *)"cant find key")); + } else ret.push_back(Pair("error",(char *)"key too big")); + } else ret.push_back(Pair("error",(char *)"null key")); + return ret; +} Value minerids(const Array& params, bool fHelp) { diff --git a/src/rpcclient.cpp b/src/rpcclient.cpp index 824ad602a..495b4addd 100644 --- a/src/rpcclient.cpp +++ b/src/rpcclient.cpp @@ -112,6 +112,7 @@ static const CRPCConvertParam vRPCConvertParams[] = { "paxpending", 0 }, { "notaries", 1 }, { "minerids", 1 }, + { "kvsearch", 1 }, }; class CRPCConvertTable diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index d7f049280..e360b7164 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -305,6 +305,7 @@ static const CRPCCommand vRPCCommands[] = { "blockchain", "paxprices", &paxprices, true }, { "blockchain", "notaries", ¬aries, true }, { "blockchain", "minerids", &minerids, true }, + { "blockchain", "kvsearch", &kvsearch, true }, /* Mining */ { "mining", "getblocktemplate", &getblocktemplate, true }, diff --git a/src/rpcserver.h b/src/rpcserver.h index 15a35a1d5..1bc3e48b3 100644 --- a/src/rpcserver.h +++ b/src/rpcserver.h @@ -247,6 +247,7 @@ extern json_spirit::Value gettxoutsetinfo(const json_spirit::Array& params, bool extern json_spirit::Value gettxout(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value notaries(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value minerids(const json_spirit::Array& params, bool fHelp); +extern json_spirit::Value kvsearch(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value paxprice(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value paxpending(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value paxprices(const json_spirit::Array& params, bool fHelp); From ed440b5eb842a5f8936dd63bbc4f23c4d2ee9f22 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 20:20:55 +0200 Subject: [PATCH 06/40] test --- src/rpcblockchain.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index dc0218e5b..b06ee16c3 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -417,14 +417,14 @@ Value kvsearch(const Array& params, bool fHelp) memcpy(key,params[0].get_str().c_str(),keylen); if ( (valuesize= komodo_kvsearch(value,key,keylen)) >= 0 ) { - std::string value; char *valuestr; int32_t m; - value.resize(valuesize+1); - hexstr = (char *)value.data(); + std::string val; char *valuestr; + val.resize(valuesize+1); + valuestr = (char *)val.data(); memcpy(valuestr,value,valuesize); valuestr[valuesize] = 0; ret.push_back(Pair("coin",(char *)(ASSETCHAINS_SYMBOL[0] == 0 ? "KMD" : ASSETCHAINS_SYMBOL))); ret.push_back(Pair("key",params[0].get_str())); - ret.push_back(Pair("value",value)); + ret.push_back(Pair("value",val)); ret.push_back(Pair("height", (int64_t)chainActive.Tip()->nHeight)); } else ret.push_back(Pair("error",(char *)"cant find key")); } else ret.push_back(Pair("error",(char *)"key too big")); From 88b08214c4923e56e582d97a554638231ebd7b05 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 20:22:08 +0200 Subject: [PATCH 07/40] test --- src/rpcblockchain.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index b06ee16c3..1110ba99d 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -405,6 +405,8 @@ char *bitcoin_address(char *coinaddr,uint8_t addrtype,uint8_t *pubkey_or_rmd160, uint32_t komodo_interest_args(int32_t *txheightp,uint32_t *tiptimep,uint64_t *valuep,uint256 hash,int32_t n); int32_t komodo_minerids(uint8_t *minerids,int32_t height); int32_t komodo_kvsearch(uint8_t value[IGUANA_MAXSCRIPTSIZE],uint8_t *key,int32_t keylen); +extern char ASSETCHAINS_SYMBOL[16]; +#define IGUANA_MAXSCRIPTSIZE 10001 Value kvsearch(const Array& params, bool fHelp) { @@ -417,7 +419,7 @@ Value kvsearch(const Array& params, bool fHelp) memcpy(key,params[0].get_str().c_str(),keylen); if ( (valuesize= komodo_kvsearch(value,key,keylen)) >= 0 ) { - std::string val; char *valuestr; + std::string val; char *valuestr; val.resize(valuesize+1); valuestr = (char *)val.data(); memcpy(valuestr,value,valuesize); From 88c3681cabcfce3993bfc31bef8fd0f208ff727c Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 20:23:02 +0200 Subject: [PATCH 08/40] test --- src/rpcblockchain.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 1110ba99d..019e1565a 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -396,6 +396,8 @@ Value gettxoutsetinfo(const Array& params, bool fHelp) return ret; } +#define IGUANA_MAXSCRIPTSIZE 10001 +extern char ASSETCHAINS_SYMBOL[16]; uint64_t komodo_interest(int32_t txheight,uint64_t nValue,uint32_t nLockTime,uint32_t tiptime); uint32_t komodo_txtime(uint256 hash); uint64_t komodo_paxprice(uint64_t *seedp,int32_t height,char *base,char *rel,uint64_t basevolume); @@ -405,8 +407,6 @@ char *bitcoin_address(char *coinaddr,uint8_t addrtype,uint8_t *pubkey_or_rmd160, uint32_t komodo_interest_args(int32_t *txheightp,uint32_t *tiptimep,uint64_t *valuep,uint256 hash,int32_t n); int32_t komodo_minerids(uint8_t *minerids,int32_t height); int32_t komodo_kvsearch(uint8_t value[IGUANA_MAXSCRIPTSIZE],uint8_t *key,int32_t keylen); -extern char ASSETCHAINS_SYMBOL[16]; -#define IGUANA_MAXSCRIPTSIZE 10001 Value kvsearch(const Array& params, bool fHelp) { From ab6e81ec8fc5252fabfce3dc1638dc37826c9d18 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 20:53:57 +0200 Subject: [PATCH 09/40] test --- src/komodo_gateway.h | 2 +- src/rpcblockchain.cpp | 6 +++--- src/rpcclient.cpp | 1 + src/rpcserver.cpp | 1 + src/rpcserver.h | 1 + src/wallet/rpcwallet.cpp | 40 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 47 insertions(+), 4 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 0cac2631e..a26efaab2 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -703,7 +703,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 memset(kmdheights,0,sizeof(kmdheights)); memset(otherheights,0,sizeof(otherheights)); tokomodo = (komodo_is_issuer() == 0); - if ( opretbuf[0] == 'K' ) + if ( opretbuf[0] == 'K' && opretlen != 40 ) { uint16_t keylen,valuesize; uint8_t *key,*value; struct komodo_kv *ptr; iguana_rwnum(0,&opretbuf[1],sizeof(keylen),&keylen); diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 019e1565a..fcc28e125 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -414,6 +414,9 @@ Value kvsearch(const Array& params, bool fHelp) LOCK(cs_main); if ( (keylen= (int32_t)strlen(params[0].get_str().c_str())) > 0 ) { + ret.push_back(Pair("coin",(char *)(ASSETCHAINS_SYMBOL[0] == 0 ? "KMD" : ASSETCHAINS_SYMBOL))); + ret.push_back(Pair("height", (int64_t)chainActive.Tip()->nHeight)); + ret.push_back(Pair("key",params[0].get_str())); if ( keylen < sizeof(key) ) { memcpy(key,params[0].get_str().c_str(),keylen); @@ -424,10 +427,7 @@ Value kvsearch(const Array& params, bool fHelp) valuestr = (char *)val.data(); memcpy(valuestr,value,valuesize); valuestr[valuesize] = 0; - ret.push_back(Pair("coin",(char *)(ASSETCHAINS_SYMBOL[0] == 0 ? "KMD" : ASSETCHAINS_SYMBOL))); - ret.push_back(Pair("key",params[0].get_str())); ret.push_back(Pair("value",val)); - ret.push_back(Pair("height", (int64_t)chainActive.Tip()->nHeight)); } else ret.push_back(Pair("error",(char *)"cant find key")); } else ret.push_back(Pair("error",(char *)"key too big")); } else ret.push_back(Pair("error",(char *)"null key")); diff --git a/src/rpcclient.cpp b/src/rpcclient.cpp index 495b4addd..241adbdec 100644 --- a/src/rpcclient.cpp +++ b/src/rpcclient.cpp @@ -113,6 +113,7 @@ static const CRPCConvertParam vRPCConvertParams[] = { "notaries", 1 }, { "minerids", 1 }, { "kvsearch", 1 }, + { "kvupdate", 2 }, }; class CRPCConvertTable diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index e360b7164..7f677fcf8 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -306,6 +306,7 @@ static const CRPCCommand vRPCCommands[] = { "blockchain", "notaries", ¬aries, true }, { "blockchain", "minerids", &minerids, true }, { "blockchain", "kvsearch", &kvsearch, true }, + { "blockchain", "kvupdate", &kvupdate, true }, /* Mining */ { "mining", "getblocktemplate", &getblocktemplate, true }, diff --git a/src/rpcserver.h b/src/rpcserver.h index 1bc3e48b3..0fda9571f 100644 --- a/src/rpcserver.h +++ b/src/rpcserver.h @@ -248,6 +248,7 @@ extern json_spirit::Value gettxout(const json_spirit::Array& params, bool fHelp) extern json_spirit::Value notaries(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value minerids(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value kvsearch(const json_spirit::Array& params, bool fHelp); +extern json_spirit::Value kvupdate(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value paxprice(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value paxpending(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value paxprices(const json_spirit::Array& params, bool fHelp); diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 9a9bd637c..82aef4f50 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -475,6 +475,7 @@ Value sendtoaddress(const Array& params, bool fHelp) return wtx.GetHash().GetHex(); } +#define IGUANA_MAXSCRIPTSIZE 10001 uint64_t PAX_fiatdest(uint64_t *seedp,int32_t tokomodo,char *destaddr,uint8_t pubkey37[37],char *coinaddr,int32_t height,char *base,int64_t fiatoshis); int32_t komodo_opreturnscript(uint8_t *script,uint8_t type,uint8_t *opret,int32_t opretlen); #define CRYPTO777_KMDADDR "RXL3YXG2ceaB6C5hfJcN4fvmLH2C34knhA" @@ -557,6 +558,45 @@ Value paxwithdraw(const Array& params, bool fHelp) return wtx.GetHash().GetHex(); } +Value kvupdate(const Array& params, bool fHelp) +{ + Object ret; uint8_t keyvalue[IGUANA_MAXSCRIPTSIZE],opretbuf[IGUANA_MAXSCRIPTSIZE]; int32_t opretlen,j; + uint16_t keylen,valuesize; uint8_t *key,*value=0; struct komodo_kv *ptr; uint64_t fee; + if (!EnsureWalletIsAvailable(fHelp)) + return 0; + LOCK2(cs_main, pwalletMain->cs_wallet); + if ( (keylen= (int32_t)strlen(params[0].get_str().c_str())) > 0 ) + { + key = (uint8_t *)params[0].get_str().c_str(); + ret.push_back(Pair("coin",(char *)(ASSETCHAINS_SYMBOL[0] == 0 ? "KMD" : ASSETCHAINS_SYMBOL))); + ret.push_back(Pair("height", (int64_t)chainActive.Tip()->nHeight)); + ret.push_back(Pair("key",params[0].get_str())); + if ( params.size() == 2 && params[1].get_str().c_str() != 0 ) + { + ret.push_back(Pair("value",params[1].get_str())); + value = (uint8_t *)params[1].get_str().c_str(); + } + iguana_rwnum(1,&keyvalue[0],sizeof(keylen),&keylen); + iguana_rwnum(1,&keyvalue[2],sizeof(valuesize),&valuesize); + memcpy(&keyvalue[4],key,keylen); + if ( value != 0 ) + memcpy(&keyvalue[4 + keylen],value,valuesize); + opretlen = komodo_opreturnscript(opretbuf,'W',keyvalue,sizeof(uint16_t)*2+keylen+valuelen); + for (i=0; i Date: Fri, 20 Jan 2017 20:59:51 +0200 Subject: [PATCH 10/40] test --- src/rpcblockchain.cpp | 2 ++ src/wallet/rpcwallet.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index fcc28e125..e395f6db8 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -411,6 +411,8 @@ int32_t komodo_kvsearch(uint8_t value[IGUANA_MAXSCRIPTSIZE],uint8_t *key,int32_t Value kvsearch(const Array& params, bool fHelp) { Object ret; uint8_t value[IGUANA_MAXSCRIPTSIZE],key[IGUANA_MAXSCRIPTSIZE]; int32_t j,valuesize,keylen; + if (fHelp || params.size() != 1 ) + throw runtime_error("kvsearch key"); LOCK(cs_main); if ( (keylen= (int32_t)strlen(params[0].get_str().c_str())) > 0 ) { diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 82aef4f50..46e41d475 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -562,6 +562,8 @@ Value kvupdate(const Array& params, bool fHelp) { Object ret; uint8_t keyvalue[IGUANA_MAXSCRIPTSIZE],opretbuf[IGUANA_MAXSCRIPTSIZE]; int32_t opretlen,j; uint16_t keylen,valuesize; uint8_t *key,*value=0; struct komodo_kv *ptr; uint64_t fee; + if (fHelp || params.size() != 2 ) + throw runtime_error("kvupdate key value"); if (!EnsureWalletIsAvailable(fHelp)) return 0; LOCK2(cs_main, pwalletMain->cs_wallet); From 6685bab2bbe6fa378bdb900d38c87ee2493094b9 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 21:02:23 +0200 Subject: [PATCH 11/40] test --- src/wallet/rpcwallet.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 46e41d475..ce80ebea2 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -560,7 +560,7 @@ Value paxwithdraw(const Array& params, bool fHelp) Value kvupdate(const Array& params, bool fHelp) { - Object ret; uint8_t keyvalue[IGUANA_MAXSCRIPTSIZE],opretbuf[IGUANA_MAXSCRIPTSIZE]; int32_t opretlen,j; + CWalletTx wtx; Object ret; uint8_t keyvalue[IGUANA_MAXSCRIPTSIZE],opretbuf[IGUANA_MAXSCRIPTSIZE]; int32_t opretlen,i; uint16_t keylen,valuesize; uint8_t *key,*value=0; struct komodo_kv *ptr; uint64_t fee; if (fHelp || params.size() != 2 ) throw runtime_error("kvupdate key value"); @@ -583,7 +583,7 @@ Value kvupdate(const Array& params, bool fHelp) memcpy(&keyvalue[4],key,keylen); if ( value != 0 ) memcpy(&keyvalue[4 + keylen],value,valuesize); - opretlen = komodo_opreturnscript(opretbuf,'W',keyvalue,sizeof(uint16_t)*2+keylen+valuelen); + opretlen = komodo_opreturnscript(opretbuf,'W',keyvalue,sizeof(uint16_t)*2+keylen+valuesize); for (i=0; i Date: Fri, 20 Jan 2017 21:13:07 +0200 Subject: [PATCH 12/40] test --- src/wallet/rpcwallet.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index ce80ebea2..935d1de93 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -561,7 +561,7 @@ Value paxwithdraw(const Array& params, bool fHelp) Value kvupdate(const Array& params, bool fHelp) { CWalletTx wtx; Object ret; uint8_t keyvalue[IGUANA_MAXSCRIPTSIZE],opretbuf[IGUANA_MAXSCRIPTSIZE]; int32_t opretlen,i; - uint16_t keylen,valuesize; uint8_t *key,*value=0; struct komodo_kv *ptr; uint64_t fee; + uint16_t keylen,valuesize=0; uint8_t *key,*value=0; struct komodo_kv *ptr; uint64_t fee; if (fHelp || params.size() != 2 ) throw runtime_error("kvupdate key value"); if (!EnsureWalletIsAvailable(fHelp)) @@ -573,10 +573,13 @@ Value kvupdate(const Array& params, bool fHelp) ret.push_back(Pair("coin",(char *)(ASSETCHAINS_SYMBOL[0] == 0 ? "KMD" : ASSETCHAINS_SYMBOL))); ret.push_back(Pair("height", (int64_t)chainActive.Tip()->nHeight)); ret.push_back(Pair("key",params[0].get_str())); + ret.push_back(Pair("keylen",keylen)); if ( params.size() == 2 && params[1].get_str().c_str() != 0 ) { - ret.push_back(Pair("value",params[1].get_str())); value = (uint8_t *)params[1].get_str().c_str(); + valuesize = (int32_t)strlen(params[1].get_str().c_str(); + ret.push_back(Pair("value",params[1].get_str())); + ret.push_back(Pair("valuesize",valuesize)); } iguana_rwnum(1,&keyvalue[0],sizeof(keylen),&keylen); iguana_rwnum(1,&keyvalue[2],sizeof(valuesize),&valuesize); @@ -594,8 +597,8 @@ Value kvupdate(const Array& params, bool fHelp) if (!destaddress.IsValid()) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid dest Bitcoin address"); SendMoney(destaddress.Get(),10000,false,wtx,opretbuf,opretlen,fee); - return wtx.GetHash().GetHex(); - } else ret.push_back(Pair("error",(char *)"null key")); + ret.push_back(Pair("txid",wtx.GetHash())); + } else ret.push_back(Pair("error",(char *)"null key")); return ret; } From 380b8ee0dd6015e9de06553d5cd4a3bc6b7fd8cf Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 21:14:57 +0200 Subject: [PATCH 13/40] test --- src/wallet/rpcwallet.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 935d1de93..1c3e0582d 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -577,7 +577,7 @@ Value kvupdate(const Array& params, bool fHelp) if ( params.size() == 2 && params[1].get_str().c_str() != 0 ) { value = (uint8_t *)params[1].get_str().c_str(); - valuesize = (int32_t)strlen(params[1].get_str().c_str(); + valuesize = (int32_t)strlen(params[1].get_str().c_str()); ret.push_back(Pair("value",params[1].get_str())); ret.push_back(Pair("valuesize",valuesize)); } @@ -586,7 +586,7 @@ Value kvupdate(const Array& params, bool fHelp) memcpy(&keyvalue[4],key,keylen); if ( value != 0 ) memcpy(&keyvalue[4 + keylen],value,valuesize); - opretlen = komodo_opreturnscript(opretbuf,'W',keyvalue,sizeof(uint16_t)*2+keylen+valuesize); + opretlen = komodo_opreturnscript(opretbuf,'K',keyvalue,sizeof(uint16_t)*2+keylen+valuesize); for (i=0; i Date: Fri, 20 Jan 2017 21:15:28 +0200 Subject: [PATCH 14/40] test --- src/wallet/rpcwallet.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 1c3e0582d..d203e63e2 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -597,7 +597,7 @@ Value kvupdate(const Array& params, bool fHelp) if (!destaddress.IsValid()) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid dest Bitcoin address"); SendMoney(destaddress.Get(),10000,false,wtx,opretbuf,opretlen,fee); - ret.push_back(Pair("txid",wtx.GetHash())); + ret.push_back(Pair("txid",wtx.GetHash().GetHex())); } else ret.push_back(Pair("error",(char *)"null key")); return ret; } From 92bd71eed00f6e29d17e3dfd1566e85798e066f2 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 21:19:24 +0200 Subject: [PATCH 15/40] test --- src/rpcblockchain.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index e395f6db8..8d3253b45 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -425,10 +425,9 @@ Value kvsearch(const Array& params, bool fHelp) if ( (valuesize= komodo_kvsearch(value,key,keylen)) >= 0 ) { std::string val; char *valuestr; - val.resize(valuesize+1); + val.resize(valuesize); valuestr = (char *)val.data(); memcpy(valuestr,value,valuesize); - valuestr[valuesize] = 0; ret.push_back(Pair("value",val)); } else ret.push_back(Pair("error",(char *)"cant find key")); } else ret.push_back(Pair("error",(char *)"key too big")); From 368da363c407e6b879abfab509278add978b2489 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 21:26:46 +0200 Subject: [PATCH 16/40] test --- src/komodo_gateway.h | 10 +++++++--- src/komodo_structs.h | 2 +- src/rpcblockchain.cpp | 11 +++++++---- src/wallet/rpcwallet.cpp | 12 +++++++----- 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index a26efaab2..5f4fb5302 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -671,13 +671,15 @@ int32_t komodo_check_deposit(int32_t height,const CBlock& block) // verify above return(0); } -int32_t komodo_kvsearch(uint8_t value[IGUANA_MAXSCRIPTSIZE],uint8_t *key,int32_t keylen) +int32_t komodo_kvsearch(int32_t *heightp,uint8_t value[IGUANA_MAXSCRIPTSIZE],uint8_t *key,int32_t keylen) { struct komodo_kv *ptr; int32_t retval = -1; + *heightp = -1; portable_mutex_lock(&KOMODO_KV_mutex); HASH_FIND(hh,KOMODO_KV,key,keylen,ptr); if ( ptr != 0 ) { + *heightp = ptr->height; if ( (retval= ptr->valuesize) != 0 ) memcpy(value,ptr->value,retval); } @@ -708,9 +710,10 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 uint16_t keylen,valuesize; uint8_t *key,*value; struct komodo_kv *ptr; iguana_rwnum(0,&opretbuf[1],sizeof(keylen),&keylen); iguana_rwnum(0,&opretbuf[3],sizeof(valuesize),&valuesize); - key = &opretbuf[5]; + iguana_rwnum(0,&opretbuf[5],sizeof(kmdheight),&kmdheight); + key = &opretbuf[9]; value = &key[keylen]; - if ( sizeof(keylen)+sizeof(valuesize)+keylen+valuesize+1 == opretlen ) + if ( sizeof(kmdheight)+sizeof(keylen)+sizeof(valuesize)+keylen+valuesize+1 == opretlen ) { portable_mutex_lock(&KOMODO_KV_mutex); HASH_FIND(hh,KOMODO_KV,key,keylen,ptr); @@ -729,6 +732,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 ptr->value = (uint8_t *)calloc(1,valuesize); memcpy(ptr->value,value,valuesize); } + ptr->height = kmdheight; portable_mutex_unlock(&KOMODO_KV_mutex); } else printf("opretlen.%d mismatch keylen.%d valuesize.%d\n",opretlen,keylen,valuesize); } diff --git a/src/komodo_structs.h b/src/komodo_structs.h index 2bb827849..73c325de2 100644 --- a/src/komodo_structs.h +++ b/src/komodo_structs.h @@ -37,7 +37,7 @@ #define KOMODO_OPRETURN_WITHDRAW 'W' // assetchain #define KOMODO_OPRETURN_REDEEMED 'X' -struct komodo_kv { UT_hash_handle hh; uint8_t *key,*value; uint16_t keylen,valuesize; }; +struct komodo_kv { UT_hash_handle hh; uint8_t *key,*value; int32_t height; uint16_t keylen,valuesize; }; struct komodo_event_notarized { uint256 blockhash,desttxid; int32_t notarizedheight; char dest[16]; }; struct komodo_event_pubkeys { uint8_t num; uint8_t pubkeys[64][33]; }; diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 8d3253b45..50b17e171 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -406,29 +406,32 @@ int32_t komodo_notaries(uint8_t pubkeys[64][33],int32_t height); char *bitcoin_address(char *coinaddr,uint8_t addrtype,uint8_t *pubkey_or_rmd160,int32_t len); uint32_t komodo_interest_args(int32_t *txheightp,uint32_t *tiptimep,uint64_t *valuep,uint256 hash,int32_t n); int32_t komodo_minerids(uint8_t *minerids,int32_t height); -int32_t komodo_kvsearch(uint8_t value[IGUANA_MAXSCRIPTSIZE],uint8_t *key,int32_t keylen); +int32_t komodo_kvsearch(int32_t *heightp,uint8_t value[IGUANA_MAXSCRIPTSIZE],uint8_t *key,int32_t keylen); Value kvsearch(const Array& params, bool fHelp) { - Object ret; uint8_t value[IGUANA_MAXSCRIPTSIZE],key[IGUANA_MAXSCRIPTSIZE]; int32_t j,valuesize,keylen; + Object ret; uint8_t value[IGUANA_MAXSCRIPTSIZE],key[IGUANA_MAXSCRIPTSIZE]; int32_t j,height,valuesize,keylen; if (fHelp || params.size() != 1 ) throw runtime_error("kvsearch key"); LOCK(cs_main); if ( (keylen= (int32_t)strlen(params[0].get_str().c_str())) > 0 ) { ret.push_back(Pair("coin",(char *)(ASSETCHAINS_SYMBOL[0] == 0 ? "KMD" : ASSETCHAINS_SYMBOL))); - ret.push_back(Pair("height", (int64_t)chainActive.Tip()->nHeight)); + ret.push_back(Pair("currentheight", (int64_t)chainActive.Tip()->nHeight)); ret.push_back(Pair("key",params[0].get_str())); + ret.push_back(Pair("keylen",keylen)); if ( keylen < sizeof(key) ) { memcpy(key,params[0].get_str().c_str(),keylen); - if ( (valuesize= komodo_kvsearch(value,key,keylen)) >= 0 ) + if ( (valuesize= komodo_kvsearch(&height,value,key,keylen)) >= 0 ) { std::string val; char *valuestr; val.resize(valuesize); valuestr = (char *)val.data(); memcpy(valuestr,value,valuesize); + ret.push_back(Pair("height",height)); ret.push_back(Pair("value",val)); + ret.push_back(Pair("valuesize",valuesize)); } else ret.push_back(Pair("error",(char *)"cant find key")); } else ret.push_back(Pair("error",(char *)"key too big")); } else ret.push_back(Pair("error",(char *)"null key")); diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index d203e63e2..6e1f2ed7b 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -560,7 +560,7 @@ Value paxwithdraw(const Array& params, bool fHelp) Value kvupdate(const Array& params, bool fHelp) { - CWalletTx wtx; Object ret; uint8_t keyvalue[IGUANA_MAXSCRIPTSIZE],opretbuf[IGUANA_MAXSCRIPTSIZE]; int32_t opretlen,i; + CWalletTx wtx; Object ret; uint8_t keyvalue[IGUANA_MAXSCRIPTSIZE],opretbuf[IGUANA_MAXSCRIPTSIZE]; int32_t opretlen,i,height; uint16_t keylen,valuesize=0; uint8_t *key,*value=0; struct komodo_kv *ptr; uint64_t fee; if (fHelp || params.size() != 2 ) throw runtime_error("kvupdate key value"); @@ -571,7 +571,8 @@ Value kvupdate(const Array& params, bool fHelp) { key = (uint8_t *)params[0].get_str().c_str(); ret.push_back(Pair("coin",(char *)(ASSETCHAINS_SYMBOL[0] == 0 ? "KMD" : ASSETCHAINS_SYMBOL))); - ret.push_back(Pair("height", (int64_t)chainActive.Tip()->nHeight)); + height = chainActive.Tip()->nHeight; + ret.push_back(Pair("height", (int64_t)height)); ret.push_back(Pair("key",params[0].get_str())); ret.push_back(Pair("keylen",keylen)); if ( params.size() == 2 && params[1].get_str().c_str() != 0 ) @@ -583,10 +584,11 @@ Value kvupdate(const Array& params, bool fHelp) } iguana_rwnum(1,&keyvalue[0],sizeof(keylen),&keylen); iguana_rwnum(1,&keyvalue[2],sizeof(valuesize),&valuesize); - memcpy(&keyvalue[4],key,keylen); + iguana_rwnum(1,&keyvalue[4],sizeof(height),&height); + memcpy(&keyvalue[8],key,keylen); if ( value != 0 ) - memcpy(&keyvalue[4 + keylen],value,valuesize); - opretlen = komodo_opreturnscript(opretbuf,'K',keyvalue,sizeof(uint16_t)*2+keylen+valuesize); + memcpy(&keyvalue[8 + keylen],value,valuesize); + opretlen = komodo_opreturnscript(opretbuf,'K',keyvalue,sizeof(height)+sizeof(uint16_t)*2+keylen+valuesize); for (i=0; i Date: Fri, 20 Jan 2017 21:38:18 +0200 Subject: [PATCH 17/40] test --- src/komodo_gateway.h | 1 + src/wallet/rpcwallet.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 5f4fb5302..7ee920089 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -713,6 +713,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 iguana_rwnum(0,&opretbuf[5],sizeof(kmdheight),&kmdheight); key = &opretbuf[9]; value = &key[keylen]; + printf("keylen.%d valuesize.%d height.%d (%02x %02x %02x) (%02x %02x %02x)\n",keylen,valuesize,kmdheight,key[0],key[1],key[2],value[0],value[1],value[2]); if ( sizeof(kmdheight)+sizeof(keylen)+sizeof(valuesize)+keylen+valuesize+1 == opretlen ) { portable_mutex_lock(&KOMODO_KV_mutex); diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 6e1f2ed7b..126a98efc 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -591,7 +591,7 @@ Value kvupdate(const Array& params, bool fHelp) opretlen = komodo_opreturnscript(opretbuf,'K',keyvalue,sizeof(height)+sizeof(uint16_t)*2+keylen+valuesize); for (i=0; i Date: Fri, 20 Jan 2017 22:15:38 +0200 Subject: [PATCH 18/40] test --- src/komodo_gateway.h | 14 +++++++++----- src/komodo_structs.h | 2 +- src/rpcblockchain.cpp | 7 ++++--- src/wallet/rpcwallet.cpp | 29 +++++++++++++++++------------ 4 files changed, 31 insertions(+), 21 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 7ee920089..a048a597b 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -671,15 +671,17 @@ int32_t komodo_check_deposit(int32_t height,const CBlock& block) // verify above return(0); } -int32_t komodo_kvsearch(int32_t *heightp,uint8_t value[IGUANA_MAXSCRIPTSIZE],uint8_t *key,int32_t keylen) +int32_t komodo_kvsearch(uint32_t *flagsp,int32_t *heightp,uint8_t value[IGUANA_MAXSCRIPTSIZE],uint8_t *key,int32_t keylen) { struct komodo_kv *ptr; int32_t retval = -1; *heightp = -1; + *flagsp = 0; portable_mutex_lock(&KOMODO_KV_mutex); HASH_FIND(hh,KOMODO_KV,key,keylen,ptr); if ( ptr != 0 ) { *heightp = ptr->height; + *flagsp = ptr->flags; if ( (retval= ptr->valuesize) != 0 ) memcpy(value,ptr->value,retval); } @@ -689,7 +691,7 @@ int32_t komodo_kvsearch(int32_t *heightp,uint8_t value[IGUANA_MAXSCRIPTSIZE],uin const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int32_t opretlen,uint256 txid,uint16_t vout,char *source) { - uint8_t rmd160[20],rmd160s[64*20],addrtype,shortflag,pubkey33[33]; int32_t didstats,i,j,n,len,tokomodo,kmdheight,otherheights[64],kmdheights[64]; int8_t baseids[64]; char base[4],coinaddr[64],destaddr[64]; uint256 txids[64]; uint16_t vouts[64]; uint64_t convtoshis,seed; int64_t fiatoshis,komodoshis,checktoshis,values[64],srcvalues[64]; struct pax_transaction *pax,*pax2; struct komodo_state *basesp; double diff; + uint8_t rmd160[20],rmd160s[64*20],addrtype,shortflag,pubkey33[33]; int32_t didstats,i,j,n,len,tokomodo,kmdheight,otherheights[64],kmdheights[64]; int8_t baseids[64]; char base[4],coinaddr[64],destaddr[64]; uint256 txids[64]; uint16_t vouts[64]; uint64_t convtoshis,seed; int64_t fiatoshis,komodoshis,checktoshis,values[64],srcvalues[64]; struct pax_transaction *pax,*pax2; struct komodo_state *basesp; double diff; uint32_t flags; const char *typestr = "unknown"; if ( KOMODO_PAX == 0 ) return("nopax"); @@ -711,16 +713,18 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 iguana_rwnum(0,&opretbuf[1],sizeof(keylen),&keylen); iguana_rwnum(0,&opretbuf[3],sizeof(valuesize),&valuesize); iguana_rwnum(0,&opretbuf[5],sizeof(kmdheight),&kmdheight); - key = &opretbuf[9]; + iguana_rwnum(0,&opretbuf[9],sizeof(flags),&flags); + key = &opretbuf[13]; value = &key[keylen]; - printf("keylen.%d valuesize.%d height.%d (%02x %02x %02x) (%02x %02x %02x)\n",keylen,valuesize,kmdheight,key[0],key[1],key[2],value[0],value[1],value[2]); - if ( sizeof(kmdheight)+sizeof(keylen)+sizeof(valuesize)+keylen+valuesize+1 == opretlen ) + //printf("keylen.%d valuesize.%d height.%d (%02x %02x %02x) (%02x %02x %02x)\n",keylen,valuesize,kmdheight,key[0],key[1],key[2],value[0],value[1],value[2]); + if ( sizeof(flags)+sizeof(kmdheight)+sizeof(keylen)+sizeof(valuesize)+keylen+valuesize+1 == opretlen ) { portable_mutex_lock(&KOMODO_KV_mutex); HASH_FIND(hh,KOMODO_KV,key,keylen,ptr); if ( ptr == 0 ) { ptr = (struct komodo_kv *)calloc(1,sizeof(*ptr)); + ptr->flags = flags; ptr->key = (uint8_t *)calloc(1,keylen); ptr->keylen = keylen; memcpy(ptr->key,key,keylen); diff --git a/src/komodo_structs.h b/src/komodo_structs.h index 73c325de2..73194ab8e 100644 --- a/src/komodo_structs.h +++ b/src/komodo_structs.h @@ -37,7 +37,7 @@ #define KOMODO_OPRETURN_WITHDRAW 'W' // assetchain #define KOMODO_OPRETURN_REDEEMED 'X' -struct komodo_kv { UT_hash_handle hh; uint8_t *key,*value; int32_t height; uint16_t keylen,valuesize; }; +struct komodo_kv { UT_hash_handle hh; uint8_t *key,*value; int32_t height; uint32_t flags; uint16_t keylen,valuesize; }; struct komodo_event_notarized { uint256 blockhash,desttxid; int32_t notarizedheight; char dest[16]; }; struct komodo_event_pubkeys { uint8_t num; uint8_t pubkeys[64][33]; }; diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 50b17e171..27b074085 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -406,11 +406,11 @@ int32_t komodo_notaries(uint8_t pubkeys[64][33],int32_t height); char *bitcoin_address(char *coinaddr,uint8_t addrtype,uint8_t *pubkey_or_rmd160,int32_t len); uint32_t komodo_interest_args(int32_t *txheightp,uint32_t *tiptimep,uint64_t *valuep,uint256 hash,int32_t n); int32_t komodo_minerids(uint8_t *minerids,int32_t height); -int32_t komodo_kvsearch(int32_t *heightp,uint8_t value[IGUANA_MAXSCRIPTSIZE],uint8_t *key,int32_t keylen); +int32_t komodo_kvsearch(uint32_t *flagsp,int32_t *heightp,uint8_t value[IGUANA_MAXSCRIPTSIZE],uint8_t *key,int32_t keylen); Value kvsearch(const Array& params, bool fHelp) { - Object ret; uint8_t value[IGUANA_MAXSCRIPTSIZE],key[IGUANA_MAXSCRIPTSIZE]; int32_t j,height,valuesize,keylen; + Object ret; uint32_t flags; uint8_t value[IGUANA_MAXSCRIPTSIZE],key[IGUANA_MAXSCRIPTSIZE]; int32_t j,height,valuesize,keylen; if (fHelp || params.size() != 1 ) throw runtime_error("kvsearch key"); LOCK(cs_main); @@ -423,13 +423,14 @@ Value kvsearch(const Array& params, bool fHelp) if ( keylen < sizeof(key) ) { memcpy(key,params[0].get_str().c_str(),keylen); - if ( (valuesize= komodo_kvsearch(&height,value,key,keylen)) >= 0 ) + if ( (valuesize= komodo_kvsearch(&flags,&height,value,key,keylen)) >= 0 ) { std::string val; char *valuestr; val.resize(valuesize); valuestr = (char *)val.data(); memcpy(valuestr,value,valuesize); ret.push_back(Pair("height",height)); + ret.push_back(Pair("flags",flags)); ret.push_back(Pair("value",val)); ret.push_back(Pair("valuesize",valuesize)); } else ret.push_back(Pair("error",(char *)"cant find key")); diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 126a98efc..29ee929bc 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -404,9 +404,9 @@ static void SendMoney(const CTxDestination &address, CAmount nValue, bool fSubtr for (i=0; ics_wallet); if ( (keylen= (int32_t)strlen(params[0].get_str().c_str())) > 0 ) { @@ -573,6 +576,7 @@ Value kvupdate(const Array& params, bool fHelp) ret.push_back(Pair("coin",(char *)(ASSETCHAINS_SYMBOL[0] == 0 ? "KMD" : ASSETCHAINS_SYMBOL))); height = chainActive.Tip()->nHeight; ret.push_back(Pair("height", (int64_t)height)); + ret.push_back(Pair("flags",flags)); ret.push_back(Pair("key",params[0].get_str())); ret.push_back(Pair("keylen",keylen)); if ( params.size() == 2 && params[1].get_str().c_str() != 0 ) @@ -585,13 +589,14 @@ Value kvupdate(const Array& params, bool fHelp) iguana_rwnum(1,&keyvalue[0],sizeof(keylen),&keylen); iguana_rwnum(1,&keyvalue[2],sizeof(valuesize),&valuesize); iguana_rwnum(1,&keyvalue[4],sizeof(height),&height); - memcpy(&keyvalue[8],key,keylen); + iguana_rwnum(1,&keyvalue[8],sizeof(flags),&flags); + memcpy(&keyvalue[12],key,keylen); if ( value != 0 ) - memcpy(&keyvalue[8 + keylen],value,valuesize); - opretlen = komodo_opreturnscript(opretbuf,'K',keyvalue,sizeof(height)+sizeof(uint16_t)*2+keylen+valuesize); - for (i=0; i Date: Fri, 20 Jan 2017 22:19:15 +0200 Subject: [PATCH 19/40] test --- src/wallet/rpcwallet.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 29ee929bc..597ddf1d0 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -573,12 +573,17 @@ Value kvupdate(const Array& params, bool fHelp) if ( (keylen= (int32_t)strlen(params[0].get_str().c_str())) > 0 ) { key = (uint8_t *)params[0].get_str().c_str(); + if ( (valuesize= komodo_kvsearch(&flags,&height,&keyvalue[keylen],key,keylen)) >= 0 && (flags & 1) != 0 ) + { + ret.push_back(Pair("error",(char *)"cant modify write once key")); + return ret; + } ret.push_back(Pair("coin",(char *)(ASSETCHAINS_SYMBOL[0] == 0 ? "KMD" : ASSETCHAINS_SYMBOL))); height = chainActive.Tip()->nHeight; ret.push_back(Pair("height", (int64_t)height)); - ret.push_back(Pair("flags",flags)); + ret.push_back(Pair("flags",(int64_t)flags)); ret.push_back(Pair("key",params[0].get_str())); - ret.push_back(Pair("keylen",keylen)); + ret.push_back(Pair("keylen",(int64_t)keylen)); if ( params.size() == 2 && params[1].get_str().c_str() != 0 ) { value = (uint8_t *)params[1].get_str().c_str(); From b17d44f3541b43154d0859d4558308fa9f704ca2 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 22:20:13 +0200 Subject: [PATCH 20/40] test --- src/rpcblockchain.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 27b074085..9c01e3b9b 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -430,7 +430,7 @@ Value kvsearch(const Array& params, bool fHelp) valuestr = (char *)val.data(); memcpy(valuestr,value,valuesize); ret.push_back(Pair("height",height)); - ret.push_back(Pair("flags",flags)); + ret.push_back(Pair("flags",(int64_t)flags)); ret.push_back(Pair("value",val)); ret.push_back(Pair("valuesize",valuesize)); } else ret.push_back(Pair("error",(char *)"cant find key")); From 69e5f7bbf3c980952c74d2069a1e54565980abc1 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 22:21:30 +0200 Subject: [PATCH 21/40] test --- src/wallet/rpcwallet.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 597ddf1d0..81f598447 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -484,6 +484,7 @@ int32_t komodo_is_issuer(); int32_t iguana_rwnum(int32_t rwflag,uint8_t *serialized,int32_t len,void *endianedp); int32_t komodo_isrealtime(int32_t *kmdheightp); int32_t pax_fiatstatus(uint64_t *available,uint64_t *deposited,uint64_t *issued,uint64_t *withdrawn,uint64_t *approved,uint64_t *redeemed,char *base); +int32_t komodo_kvsearch(uint32_t *flagsp,int32_t *heightp,uint8_t value[IGUANA_MAXSCRIPTSIZE],uint8_t *key,int32_t keylen); Value paxdeposit(const Array& params, bool fHelp) { @@ -563,7 +564,7 @@ Value kvupdate(const Array& params, bool fHelp) CWalletTx wtx; Object ret; uint8_t keyvalue[IGUANA_MAXSCRIPTSIZE],opretbuf[IGUANA_MAXSCRIPTSIZE]; int32_t opretlen,height; uint16_t keylen,valuesize=0; uint8_t *key,*value=0; uint32_t flags; struct komodo_kv *ptr; uint64_t fee; if (fHelp || params.size() < 2 ) - throw runtime_error("kvupdate key value"); + throw runtime_error("kvupdate key value [flags]"); if (!EnsureWalletIsAvailable(fHelp)) return 0; if ( params.size() == 3 ) From 64449ba8197bccc800ba627a72e35a018c36a99e Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 22:39:49 +0200 Subject: [PATCH 22/40] test --- src/komodo_gateway.h | 40 ++++++++++++++++++++++++++++------------ src/komodo_structs.h | 4 ++++ src/rpcblockchain.cpp | 4 ++-- src/wallet/rpcwallet.cpp | 7 ++++--- 4 files changed, 38 insertions(+), 17 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index a048a597b..d7a7c4a39 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -671,19 +671,32 @@ int32_t komodo_check_deposit(int32_t height,const CBlock& block) // verify above return(0); } -int32_t komodo_kvsearch(uint32_t *flagsp,int32_t *heightp,uint8_t value[IGUANA_MAXSCRIPTSIZE],uint8_t *key,int32_t keylen) +int32_t komodo_kvsearch(int32_t current_height,uint32_t *flagsp,int32_t *heightp,uint8_t value[IGUANA_MAXSCRIPTSIZE],uint8_t *key,int32_t keylen) { - struct komodo_kv *ptr; int32_t retval = -1; + struct komodo_kv *ptr; int32_t duration,retval = -1; *heightp = -1; *flagsp = 0; portable_mutex_lock(&KOMODO_KV_mutex); HASH_FIND(hh,KOMODO_KV,key,keylen,ptr); if ( ptr != 0 ) { - *heightp = ptr->height; - *flagsp = ptr->flags; - if ( (retval= ptr->valuesize) != 0 ) - memcpy(value,ptr->value,retval); + duration = ((ptr->flags >> 2) + 1) * KOMODO_KVDURATION; + if ( current_height > (ptr->height + duration) ) + { + HASH_DELETE(hh,KOMODO_KV,ptr); + if ( ptr->value != 0 ) + free(ptr->value); + if ( ptr->key != 0 ) + free(ptr->key); + free(ptr); + } + else + { + *heightp = ptr->height; + *flagsp = ptr->flags; + if ( (retval= ptr->valuesize) != 0 ) + memcpy(value,ptr->value,retval); + } } portable_mutex_unlock(&KOMODO_KV_mutex); return(retval); @@ -730,14 +743,17 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 memcpy(ptr->key,key,keylen); HASH_ADD_KEYPTR(hh,KOMODO_KV,ptr->key,ptr->keylen,ptr); } - if ( ptr->value != 0 ) - free(ptr->value), ptr->value = 0; - if ( (ptr->valuesize= valuesize) != 0 ) + else if ( (ptr->flags & KOMODO_KVPROTECTED) == 0 ) { - ptr->value = (uint8_t *)calloc(1,valuesize); - memcpy(ptr->value,value,valuesize); + if ( ptr->value != 0 ) + free(ptr->value), ptr->value = 0; + if ( (ptr->valuesize= valuesize) != 0 ) + { + ptr->value = (uint8_t *)calloc(1,valuesize); + memcpy(ptr->value,value,valuesize); + } + ptr->height = kmdheight; } - ptr->height = kmdheight; portable_mutex_unlock(&KOMODO_KV_mutex); } else printf("opretlen.%d mismatch keylen.%d valuesize.%d\n",opretlen,keylen,valuesize); } diff --git a/src/komodo_structs.h b/src/komodo_structs.h index 73194ab8e..672516ee3 100644 --- a/src/komodo_structs.h +++ b/src/komodo_structs.h @@ -37,6 +37,10 @@ #define KOMODO_OPRETURN_WITHDRAW 'W' // assetchain #define KOMODO_OPRETURN_REDEEMED 'X' +#define KOMODO_KVPROTECTED 1 +#define KOMODO_KVBINARY 2 +#define KOMODO_KVDURATION 1440 + struct komodo_kv { UT_hash_handle hh; uint8_t *key,*value; int32_t height; uint32_t flags; uint16_t keylen,valuesize; }; struct komodo_event_notarized { uint256 blockhash,desttxid; int32_t notarizedheight; char dest[16]; }; diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 9c01e3b9b..3fa60b80e 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -406,7 +406,7 @@ int32_t komodo_notaries(uint8_t pubkeys[64][33],int32_t height); char *bitcoin_address(char *coinaddr,uint8_t addrtype,uint8_t *pubkey_or_rmd160,int32_t len); uint32_t komodo_interest_args(int32_t *txheightp,uint32_t *tiptimep,uint64_t *valuep,uint256 hash,int32_t n); int32_t komodo_minerids(uint8_t *minerids,int32_t height); -int32_t komodo_kvsearch(uint32_t *flagsp,int32_t *heightp,uint8_t value[IGUANA_MAXSCRIPTSIZE],uint8_t *key,int32_t keylen); +int32_t komodo_kvsearch(int32_t current_height,uint32_t *flagsp,int32_t *heightp,uint8_t value[IGUANA_MAXSCRIPTSIZE],uint8_t *key,int32_t keylen); Value kvsearch(const Array& params, bool fHelp) { @@ -423,7 +423,7 @@ Value kvsearch(const Array& params, bool fHelp) if ( keylen < sizeof(key) ) { memcpy(key,params[0].get_str().c_str(),keylen); - if ( (valuesize= komodo_kvsearch(&flags,&height,value,key,keylen)) >= 0 ) + if ( (valuesize= komodo_kvsearch(chainActive.Tip()->nHeight,&flags,&height,value,key,keylen)) >= 0 ) { std::string val; char *valuestr; val.resize(valuesize); diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 81f598447..141729f6a 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -475,6 +475,7 @@ Value sendtoaddress(const Array& params, bool fHelp) return wtx.GetHash().GetHex(); } +#define KOMODO_KVPROTECTED 1 #define IGUANA_MAXSCRIPTSIZE 10001 uint64_t PAX_fiatdest(uint64_t *seedp,int32_t tokomodo,char *destaddr,uint8_t pubkey37[37],char *coinaddr,int32_t height,char *base,int64_t fiatoshis); int32_t komodo_opreturnscript(uint8_t *script,uint8_t type,uint8_t *opret,int32_t opretlen); @@ -484,7 +485,7 @@ int32_t komodo_is_issuer(); int32_t iguana_rwnum(int32_t rwflag,uint8_t *serialized,int32_t len,void *endianedp); int32_t komodo_isrealtime(int32_t *kmdheightp); int32_t pax_fiatstatus(uint64_t *available,uint64_t *deposited,uint64_t *issued,uint64_t *withdrawn,uint64_t *approved,uint64_t *redeemed,char *base); -int32_t komodo_kvsearch(uint32_t *flagsp,int32_t *heightp,uint8_t value[IGUANA_MAXSCRIPTSIZE],uint8_t *key,int32_t keylen); +int32_t komodo_kvsearch(int32_t current_height,uint32_t *flagsp,int32_t *heightp,uint8_t value[IGUANA_MAXSCRIPTSIZE],uint8_t *key,int32_t keylen); Value paxdeposit(const Array& params, bool fHelp) { @@ -574,7 +575,7 @@ Value kvupdate(const Array& params, bool fHelp) if ( (keylen= (int32_t)strlen(params[0].get_str().c_str())) > 0 ) { key = (uint8_t *)params[0].get_str().c_str(); - if ( (valuesize= komodo_kvsearch(&flags,&height,&keyvalue[keylen],key,keylen)) >= 0 && (flags & 1) != 0 ) + if ( (valuesize= komodo_kvsearch(chainActive.Tip()->nHeight,&flags,&height,&keyvalue[keylen],key,keylen)) >= 0 && (flags & KOMODO_KVPROTECTED) != 0 ) { ret.push_back(Pair("error",(char *)"cant modify write once key")); return ret; @@ -604,7 +605,7 @@ Value kvupdate(const Array& params, bool fHelp) // printf("%02x",opretbuf[i]); //printf(" opretbuf keylen.%d valuesize.%d height.%d (%02x %02x %02x)\n",*(uint16_t *)&keyvalue[0],*(uint16_t *)&keyvalue[2],*(uint32_t *)&keyvalue[4],keyvalue[8],keyvalue[9],keyvalue[10]); EnsureWalletIsUnlocked(); - if ( (fee= opretlen * opretlen / keylen) < 100000 ) + if ( (fee= ((flags>>2)+1)*(opretlen * opretlen / keylen)) < 100000 ) fee = 100000; CBitcoinAddress destaddress(CRYPTO777_KMDADDR); if (!destaddress.IsValid()) From 4b111c219f3fea187fa7106ffd61ac61de716e9d Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 22:47:35 +0200 Subject: [PATCH 23/40] test --- src/komodo_gateway.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index d7a7c4a39..8249daa49 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -681,6 +681,7 @@ int32_t komodo_kvsearch(int32_t current_height,uint32_t *flagsp,int32_t *heightp if ( ptr != 0 ) { duration = ((ptr->flags >> 2) + 1) * KOMODO_KVDURATION; + printf("duration.%d flags.%d current.%d ht.%d\n",duration,ptr->flags,current_height,ptr->height); if ( current_height > (ptr->height + duration) ) { HASH_DELETE(hh,KOMODO_KV,ptr); From 28a37cb90746cdcb246dcda964a95a9572bcbb07 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 22:51:35 +0200 Subject: [PATCH 24/40] test --- src/komodo_gateway.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 8249daa49..b121de101 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -730,7 +730,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 iguana_rwnum(0,&opretbuf[9],sizeof(flags),&flags); key = &opretbuf[13]; value = &key[keylen]; - //printf("keylen.%d valuesize.%d height.%d (%02x %02x %02x) (%02x %02x %02x)\n",keylen,valuesize,kmdheight,key[0],key[1],key[2],value[0],value[1],value[2]); + printf("keylen.%d valuesize.%d height.%d (%02x %02x %02x) (%02x %02x %02x)\n",keylen,valuesize,kmdheight,key[0],key[1],key[2],value[0],value[1],value[2]); if ( sizeof(flags)+sizeof(kmdheight)+sizeof(keylen)+sizeof(valuesize)+keylen+valuesize+1 == opretlen ) { portable_mutex_lock(&KOMODO_KV_mutex); From 0b748e97fc6b0a87a67399d6887fff9f8c8ca359 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 22:54:47 +0200 Subject: [PATCH 25/40] test --- src/rpcclient.cpp | 2 +- src/wallet/rpcwallet.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/rpcclient.cpp b/src/rpcclient.cpp index 241adbdec..a384b063d 100644 --- a/src/rpcclient.cpp +++ b/src/rpcclient.cpp @@ -113,7 +113,7 @@ static const CRPCConvertParam vRPCConvertParams[] = { "notaries", 1 }, { "minerids", 1 }, { "kvsearch", 1 }, - { "kvupdate", 2 }, + { "kvupdate", 3 }, }; class CRPCConvertTable diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 141729f6a..39fefecd1 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -600,7 +600,8 @@ Value kvupdate(const Array& params, bool fHelp) memcpy(&keyvalue[12],key,keylen); if ( value != 0 ) memcpy(&keyvalue[12 + keylen],value,valuesize); - opretlen = komodo_opreturnscript(opretbuf,'K',keyvalue,sizeof(flags)+sizeof(height)+sizeof(uint16_t)*2+keylen+valuesize); + if ( (opretlen= komodo_opreturnscript(opretbuf,'K',keyvalue,sizeof(flags)+sizeof(height)+sizeof(uint16_t)*2+keylen+valuesize)) == 40 ) + opretlen++; //for (i=0; i Date: Fri, 20 Jan 2017 22:59:07 +0200 Subject: [PATCH 26/40] test --- src/wallet/rpcwallet.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 39fefecd1..70a261bf7 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -569,8 +569,10 @@ Value kvupdate(const Array& params, bool fHelp) if (!EnsureWalletIsAvailable(fHelp)) return 0; if ( params.size() == 3 ) + { flags = atoi(params[2].get_str().c_str()); - else flags = 0; + printf("flags.%d (%s)\n",flags,params[2].get_str().c_str()); + } else flags = 0; LOCK2(cs_main, pwalletMain->cs_wallet); if ( (keylen= (int32_t)strlen(params[0].get_str().c_str())) > 0 ) { From 5658d39db6a1ed9b28eee69cf7d9bf481bc47879 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 23:04:04 +0200 Subject: [PATCH 27/40] test --- src/wallet/rpcwallet.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 70a261bf7..2428c9cf2 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -588,7 +588,7 @@ Value kvupdate(const Array& params, bool fHelp) ret.push_back(Pair("flags",(int64_t)flags)); ret.push_back(Pair("key",params[0].get_str())); ret.push_back(Pair("keylen",(int64_t)keylen)); - if ( params.size() == 2 && params[1].get_str().c_str() != 0 ) + if ( params.size() >= 2 && params[1].get_str().c_str() != 0 ) { value = (uint8_t *)params[1].get_str().c_str(); valuesize = (int32_t)strlen(params[1].get_str().c_str()); From d3a30109611eaf7d87992abde03fefec083c28b9 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 23:13:40 +0200 Subject: [PATCH 28/40] test --- src/wallet/rpcwallet.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 2428c9cf2..bbaf05656 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -563,7 +563,7 @@ Value paxwithdraw(const Array& params, bool fHelp) Value kvupdate(const Array& params, bool fHelp) { CWalletTx wtx; Object ret; - uint8_t keyvalue[IGUANA_MAXSCRIPTSIZE],opretbuf[IGUANA_MAXSCRIPTSIZE]; int32_t opretlen,height; uint16_t keylen,valuesize=0; uint8_t *key,*value=0; uint32_t flags; struct komodo_kv *ptr; uint64_t fee; + uint8_t keyvalue[IGUANA_MAXSCRIPTSIZE],opretbuf[IGUANA_MAXSCRIPTSIZE]; int32_t opretlen,height; uint16_t keylen,valuesize=0; uint8_t *key,*value=0; uint32_t flags,tmpflags; struct komodo_kv *ptr; uint64_t fee; if (fHelp || params.size() < 2 ) throw runtime_error("kvupdate key value [flags]"); if (!EnsureWalletIsAvailable(fHelp)) @@ -577,7 +577,7 @@ Value kvupdate(const Array& params, bool fHelp) if ( (keylen= (int32_t)strlen(params[0].get_str().c_str())) > 0 ) { key = (uint8_t *)params[0].get_str().c_str(); - if ( (valuesize= komodo_kvsearch(chainActive.Tip()->nHeight,&flags,&height,&keyvalue[keylen],key,keylen)) >= 0 && (flags & KOMODO_KVPROTECTED) != 0 ) + if ( (valuesize= komodo_kvsearch(chainActive.Tip()->nHeight,&tmpflags,&height,&keyvalue[keylen],key,keylen)) >= 0 && (tmpflags & KOMODO_KVPROTECTED) != 0 ) { ret.push_back(Pair("error",(char *)"cant modify write once key")); return ret; From 667f6dd525627e470682b71ab369a1e4f817ec80 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 23:21:58 +0200 Subject: [PATCH 29/40] test --- src/komodo_gateway.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index b121de101..a08cdb758 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -730,7 +730,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 iguana_rwnum(0,&opretbuf[9],sizeof(flags),&flags); key = &opretbuf[13]; value = &key[keylen]; - printf("keylen.%d valuesize.%d height.%d (%02x %02x %02x) (%02x %02x %02x)\n",keylen,valuesize,kmdheight,key[0],key[1],key[2],value[0],value[1],value[2]); + printf("flags.%d keylen.%d valuesize.%d height.%d (%02x %02x %02x) (%02x %02x %02x)\n",flags,keylen,valuesize,kmdheight,key[0],key[1],key[2],value[0],value[1],value[2]); if ( sizeof(flags)+sizeof(kmdheight)+sizeof(keylen)+sizeof(valuesize)+keylen+valuesize+1 == opretlen ) { portable_mutex_lock(&KOMODO_KV_mutex); From eb651307cb887c76b8cc09df5f70a80786706cdf Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 23:24:35 +0200 Subject: [PATCH 30/40] test --- src/komodo_gateway.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index a08cdb758..7723d689a 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -754,6 +754,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 memcpy(ptr->value,value,valuesize); } ptr->height = kmdheight; + ptr->flags = flags; } portable_mutex_unlock(&KOMODO_KV_mutex); } else printf("opretlen.%d mismatch keylen.%d valuesize.%d\n",opretlen,keylen,valuesize); From a6b182bd5dfc8cc1f1640626f6c0140dc50ecf78 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 23:29:22 +0200 Subject: [PATCH 31/40] test --- src/rpcblockchain.cpp | 4 +++- src/wallet/rpcwallet.cpp | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 3fa60b80e..ec36a9962 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -410,7 +410,7 @@ int32_t komodo_kvsearch(int32_t current_height,uint32_t *flagsp,int32_t *heightp Value kvsearch(const Array& params, bool fHelp) { - Object ret; uint32_t flags; uint8_t value[IGUANA_MAXSCRIPTSIZE],key[IGUANA_MAXSCRIPTSIZE]; int32_t j,height,valuesize,keylen; + Object ret; uint32_t flags; uint8_t value[IGUANA_MAXSCRIPTSIZE],key[IGUANA_MAXSCRIPTSIZE]; int32_t duration,j,height,valuesize,keylen; if (fHelp || params.size() != 1 ) throw runtime_error("kvsearch key"); LOCK(cs_main); @@ -430,6 +430,8 @@ Value kvsearch(const Array& params, bool fHelp) valuestr = (char *)val.data(); memcpy(valuestr,value,valuesize); ret.push_back(Pair("height",height)); + duration = ((flags >> 2) + 1) * KOMODO_KVDURATION; + ret.push_back(Pair("expiration", (int64_t)(height+duration))); ret.push_back(Pair("flags",(int64_t)flags)); ret.push_back(Pair("value",val)); ret.push_back(Pair("valuesize",valuesize)); diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index bbaf05656..1032116a8 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -563,7 +563,7 @@ Value paxwithdraw(const Array& params, bool fHelp) Value kvupdate(const Array& params, bool fHelp) { CWalletTx wtx; Object ret; - uint8_t keyvalue[IGUANA_MAXSCRIPTSIZE],opretbuf[IGUANA_MAXSCRIPTSIZE]; int32_t opretlen,height; uint16_t keylen,valuesize=0; uint8_t *key,*value=0; uint32_t flags,tmpflags; struct komodo_kv *ptr; uint64_t fee; + uint8_t keyvalue[IGUANA_MAXSCRIPTSIZE],opretbuf[IGUANA_MAXSCRIPTSIZE]; int32_t duration,opretlen,height; uint16_t keylen,valuesize=0; uint8_t *key,*value=0; uint32_t flags,tmpflags; struct komodo_kv *ptr; uint64_t fee; if (fHelp || params.size() < 2 ) throw runtime_error("kvupdate key value [flags]"); if (!EnsureWalletIsAvailable(fHelp)) @@ -585,6 +585,8 @@ Value kvupdate(const Array& params, bool fHelp) ret.push_back(Pair("coin",(char *)(ASSETCHAINS_SYMBOL[0] == 0 ? "KMD" : ASSETCHAINS_SYMBOL))); height = chainActive.Tip()->nHeight; ret.push_back(Pair("height", (int64_t)height)); + duration = ((flags >> 2) + 1) * KOMODO_KVDURATION; + ret.push_back(Pair("expiration", (int64_t)(height+duration))); ret.push_back(Pair("flags",(int64_t)flags)); ret.push_back(Pair("key",params[0].get_str())); ret.push_back(Pair("keylen",(int64_t)keylen)); @@ -610,6 +612,7 @@ Value kvupdate(const Array& params, bool fHelp) EnsureWalletIsUnlocked(); if ( (fee= ((flags>>2)+1)*(opretlen * opretlen / keylen)) < 100000 ) fee = 100000; + ret.push_back(Pair("fee",(double)fee/COIN)); CBitcoinAddress destaddress(CRYPTO777_KMDADDR); if (!destaddress.IsValid()) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid dest Bitcoin address"); From 638ac3ba55ae8112bf1eabdf8985a0fb0ce0a2ca Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 23:32:11 +0200 Subject: [PATCH 32/40] test --- src/rpcblockchain.cpp | 2 ++ src/wallet/rpcwallet.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index ec36a9962..82e5d21e6 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -397,6 +397,8 @@ Value gettxoutsetinfo(const Array& params, bool fHelp) } #define IGUANA_MAXSCRIPTSIZE 10001 +#define KOMODO_KVDURATION 1440 +#define KOMODO_KVBINARY 2 extern char ASSETCHAINS_SYMBOL[16]; uint64_t komodo_interest(int32_t txheight,uint64_t nValue,uint32_t nLockTime,uint32_t tiptime); uint32_t komodo_txtime(uint256 hash); diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 1032116a8..113dc7936 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -476,6 +476,8 @@ Value sendtoaddress(const Array& params, bool fHelp) } #define KOMODO_KVPROTECTED 1 +#define KOMODO_KVBINARY 2 +#define KOMODO_KVDURATION 1440 #define IGUANA_MAXSCRIPTSIZE 10001 uint64_t PAX_fiatdest(uint64_t *seedp,int32_t tokomodo,char *destaddr,uint8_t pubkey37[37],char *coinaddr,int32_t height,char *base,int64_t fiatoshis); int32_t komodo_opreturnscript(uint8_t *script,uint8_t type,uint8_t *opret,int32_t opretlen); From ca493c508b13413c18a532d4958ce56f6ddf40ba Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 23:43:18 +0200 Subject: [PATCH 33/40] test --- src/komodo_gateway.h | 53 ++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 7723d689a..72e8ba4c7 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -705,7 +705,7 @@ int32_t komodo_kvsearch(int32_t current_height,uint32_t *flagsp,int32_t *heightp const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int32_t opretlen,uint256 txid,uint16_t vout,char *source) { - uint8_t rmd160[20],rmd160s[64*20],addrtype,shortflag,pubkey33[33]; int32_t didstats,i,j,n,len,tokomodo,kmdheight,otherheights[64],kmdheights[64]; int8_t baseids[64]; char base[4],coinaddr[64],destaddr[64]; uint256 txids[64]; uint16_t vouts[64]; uint64_t convtoshis,seed; int64_t fiatoshis,komodoshis,checktoshis,values[64],srcvalues[64]; struct pax_transaction *pax,*pax2; struct komodo_state *basesp; double diff; uint32_t flags; + uint8_t rmd160[20],rmd160s[64*20],addrtype,shortflag,pubkey33[33]; int32_t didstats,i,j,n,len,tokomodo,kmdheight,otherheights[64],kmdheights[64]; int8_t baseids[64]; char base[4],coinaddr[64],destaddr[64]; uint256 txids[64]; uint16_t vouts[64]; uint64_t convtoshis,seed; int64_t fee,fiatoshis,komodoshis,checktoshis,values[64],srcvalues[64]; struct pax_transaction *pax,*pax2; struct komodo_state *basesp; double diff; uint32_t flags; const char *typestr = "unknown"; if ( KOMODO_PAX == 0 ) return("nopax"); @@ -730,33 +730,38 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 iguana_rwnum(0,&opretbuf[9],sizeof(flags),&flags); key = &opretbuf[13]; value = &key[keylen]; - printf("flags.%d keylen.%d valuesize.%d height.%d (%02x %02x %02x) (%02x %02x %02x)\n",flags,keylen,valuesize,kmdheight,key[0],key[1],key[2],value[0],value[1],value[2]); - if ( sizeof(flags)+sizeof(kmdheight)+sizeof(keylen)+sizeof(valuesize)+keylen+valuesize+1 == opretlen ) + if ( (fee= ((flags>>2)+1)*(opretlen * opretlen / keylen)) < 100000 ) + fee = 100000; + printf("fee %.8f vs %.8f flags.%d keylen.%d valuesize.%d height.%d (%02x %02x %02x) (%02x %02x %02x)\n",(double)fee/COIN,(double)value/COIN,flags,keylen,valuesize,kmdheight,key[0],key[1],key[2],value[0],value[1],value[2]); + if ( value >= fee ) { - portable_mutex_lock(&KOMODO_KV_mutex); - HASH_FIND(hh,KOMODO_KV,key,keylen,ptr); - if ( ptr == 0 ) + if ( sizeof(flags)+sizeof(kmdheight)+sizeof(keylen)+sizeof(valuesize)+keylen+valuesize+1 == opretlen ) { - ptr = (struct komodo_kv *)calloc(1,sizeof(*ptr)); - ptr->flags = flags; - ptr->key = (uint8_t *)calloc(1,keylen); - ptr->keylen = keylen; - memcpy(ptr->key,key,keylen); - HASH_ADD_KEYPTR(hh,KOMODO_KV,ptr->key,ptr->keylen,ptr); - } - else if ( (ptr->flags & KOMODO_KVPROTECTED) == 0 ) - { - if ( ptr->value != 0 ) - free(ptr->value), ptr->value = 0; - if ( (ptr->valuesize= valuesize) != 0 ) + portable_mutex_lock(&KOMODO_KV_mutex); + HASH_FIND(hh,KOMODO_KV,key,keylen,ptr); + if ( ptr == 0 ) { - ptr->value = (uint8_t *)calloc(1,valuesize); - memcpy(ptr->value,value,valuesize); + ptr = (struct komodo_kv *)calloc(1,sizeof(*ptr)); + ptr->flags = flags; + ptr->key = (uint8_t *)calloc(1,keylen); + ptr->keylen = keylen; + memcpy(ptr->key,key,keylen); + HASH_ADD_KEYPTR(hh,KOMODO_KV,ptr->key,ptr->keylen,ptr); } - ptr->height = kmdheight; - ptr->flags = flags; - } - portable_mutex_unlock(&KOMODO_KV_mutex); + else if ( (ptr->flags & KOMODO_KVPROTECTED) == 0 ) + { + if ( ptr->value != 0 ) + free(ptr->value), ptr->value = 0; + if ( (ptr->valuesize= valuesize) != 0 ) + { + ptr->value = (uint8_t *)calloc(1,valuesize); + memcpy(ptr->value,value,valuesize); + } + ptr->height = kmdheight; + ptr->flags = flags; + } + portable_mutex_unlock(&KOMODO_KV_mutex); + } else printf("insufficient fee %.8f vs %.8f flags.%d keylen.%d valuesize.%d height.%d (%02x %02x %02x) (%02x %02x %02x)\n",(double)fee/COIN,(double)value/COIN,flags,keylen,valuesize,kmdheight,key[0],key[1],key[2],value[0],value[1],value[2]); } else printf("opretlen.%d mismatch keylen.%d valuesize.%d\n",opretlen,keylen,valuesize); } else if ( opretbuf[0] == 'D' ) From 07906eb94c3ef25968e31492b06b9fee58c8a70e Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 23:45:35 +0200 Subject: [PATCH 34/40] test --- src/komodo_gateway.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 72e8ba4c7..4950c4e6d 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -723,16 +723,16 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 tokomodo = (komodo_is_issuer() == 0); if ( opretbuf[0] == 'K' && opretlen != 40 ) { - uint16_t keylen,valuesize; uint8_t *key,*value; struct komodo_kv *ptr; + uint16_t keylen,valuesize; uint8_t *key,*valueptr; struct komodo_kv *ptr; iguana_rwnum(0,&opretbuf[1],sizeof(keylen),&keylen); iguana_rwnum(0,&opretbuf[3],sizeof(valuesize),&valuesize); iguana_rwnum(0,&opretbuf[5],sizeof(kmdheight),&kmdheight); iguana_rwnum(0,&opretbuf[9],sizeof(flags),&flags); key = &opretbuf[13]; - value = &key[keylen]; + valueptr = &key[keylen]; if ( (fee= ((flags>>2)+1)*(opretlen * opretlen / keylen)) < 100000 ) fee = 100000; - printf("fee %.8f vs %.8f flags.%d keylen.%d valuesize.%d height.%d (%02x %02x %02x) (%02x %02x %02x)\n",(double)fee/COIN,(double)value/COIN,flags,keylen,valuesize,kmdheight,key[0],key[1],key[2],value[0],value[1],value[2]); + printf("fee %.8f vs %.8f flags.%d keylen.%d valuesize.%d height.%d (%02x %02x %02x) (%02x %02x %02x)\n",(double)fee/COIN,(double)value/COIN,flags,keylen,valuesize,kmdheight,key[0],key[1],key[2],valueptr[0],valueptr[1],valueptr[2]); if ( value >= fee ) { if ( sizeof(flags)+sizeof(kmdheight)+sizeof(keylen)+sizeof(valuesize)+keylen+valuesize+1 == opretlen ) @@ -755,13 +755,13 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 if ( (ptr->valuesize= valuesize) != 0 ) { ptr->value = (uint8_t *)calloc(1,valuesize); - memcpy(ptr->value,value,valuesize); + memcpy(ptr->value,valueptr,valuesize); } ptr->height = kmdheight; ptr->flags = flags; } portable_mutex_unlock(&KOMODO_KV_mutex); - } else printf("insufficient fee %.8f vs %.8f flags.%d keylen.%d valuesize.%d height.%d (%02x %02x %02x) (%02x %02x %02x)\n",(double)fee/COIN,(double)value/COIN,flags,keylen,valuesize,kmdheight,key[0],key[1],key[2],value[0],value[1],value[2]); + } else printf("insufficient fee %.8f vs %.8f flags.%d keylen.%d valuesize.%d height.%d (%02x %02x %02x) (%02x %02x %02x)\n",(double)fee/COIN,(double)value/COIN,flags,keylen,valuesize,kmdheight,key[0],key[1],key[2],valueptr[0],valueptr[1],valueptr[2]); } else printf("opretlen.%d mismatch keylen.%d valuesize.%d\n",opretlen,keylen,valuesize); } else if ( opretbuf[0] == 'D' ) From 399ebd854ed9419c32d8d294a0f4d8edcb4fbf57 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 21 Jan 2017 12:38:06 +0200 Subject: [PATCH 35/40] test --- src/komodo_gateway.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 4950c4e6d..a6c9a4766 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -681,7 +681,7 @@ int32_t komodo_kvsearch(int32_t current_height,uint32_t *flagsp,int32_t *heightp if ( ptr != 0 ) { duration = ((ptr->flags >> 2) + 1) * KOMODO_KVDURATION; - printf("duration.%d flags.%d current.%d ht.%d\n",duration,ptr->flags,current_height,ptr->height); + printf("duration.%d flags.%d current.%d ht.%d keylen.%d valuesize.%d\n",duration,ptr->flags,current_height,ptr->height,ptr->keylen,ptr->valuesize); if ( current_height > (ptr->height + duration) ) { HASH_DELETE(hh,KOMODO_KV,ptr); From 51ff33a485fe859487606be9c76e5f8b08c80d86 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 21 Jan 2017 13:01:54 +0200 Subject: [PATCH 36/40] test --- src/komodo_gateway.h | 31 +++++++++++++++++++++++-------- src/wallet/rpcwallet.cpp | 14 +++++++++----- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index a6c9a4766..f9d058799 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -703,6 +703,17 @@ int32_t komodo_kvsearch(int32_t current_height,uint32_t *flagsp,int32_t *heightp return(retval); } +int32_t komodo_kvcmp(uint8_t *refvalue,uint16_t refvaluesize,uint8_t *value,uint16_t valuesize) +{ + if ( refvalue == 0 && value == 0 ) + return(0); + else if ( refvalue == 0 || value == 0 ) + return(-1); + else if ( refvaluesize != valuesize ) + return(-1); + else return(memcmp(refvalue,value,valuesize); +} + const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int32_t opretlen,uint256 txid,uint16_t vout,char *source) { uint8_t rmd160[20],rmd160s[64*20],addrtype,shortflag,pubkey33[33]; int32_t didstats,i,j,n,len,tokomodo,kmdheight,otherheights[64],kmdheights[64]; int8_t baseids[64]; char base[4],coinaddr[64],destaddr[64]; uint256 txids[64]; uint16_t vouts[64]; uint64_t convtoshis,seed; int64_t fee,fiatoshis,komodoshis,checktoshis,values[64],srcvalues[64]; struct pax_transaction *pax,*pax2; struct komodo_state *basesp; double diff; uint32_t flags; @@ -723,7 +734,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 tokomodo = (komodo_is_issuer() == 0); if ( opretbuf[0] == 'K' && opretlen != 40 ) { - uint16_t keylen,valuesize; uint8_t *key,*valueptr; struct komodo_kv *ptr; + uint16_t keylen,valuesize,newflag = 0,cmpval = 1; uint8_t *key,*valueptr; struct komodo_kv *ptr; iguana_rwnum(0,&opretbuf[1],sizeof(keylen),&keylen); iguana_rwnum(0,&opretbuf[3],sizeof(valuesize),&valuesize); iguana_rwnum(0,&opretbuf[5],sizeof(kmdheight),&kmdheight); @@ -732,6 +743,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 valueptr = &key[keylen]; if ( (fee= ((flags>>2)+1)*(opretlen * opretlen / keylen)) < 100000 ) fee = 100000; + // 6a164b040005006a00000000000000746573743834393333 printf("fee %.8f vs %.8f flags.%d keylen.%d valuesize.%d height.%d (%02x %02x %02x) (%02x %02x %02x)\n",(double)fee/COIN,(double)value/COIN,flags,keylen,valuesize,kmdheight,key[0],key[1],key[2],valueptr[0],valueptr[1],valueptr[2]); if ( value >= fee ) { @@ -742,20 +754,23 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 if ( ptr == 0 ) { ptr = (struct komodo_kv *)calloc(1,sizeof(*ptr)); - ptr->flags = flags; ptr->key = (uint8_t *)calloc(1,keylen); ptr->keylen = keylen; memcpy(ptr->key,key,keylen); + newflag = 1; HASH_ADD_KEYPTR(hh,KOMODO_KV,ptr->key,ptr->keylen,ptr); } - else if ( (ptr->flags & KOMODO_KVPROTECTED) == 0 ) + if ( newflag != 0 || (ptr->flags & KOMODO_KVPROTECTED) == 0 || (cmpval= komodo_kvcmp(ptr->value,ptr->valuesize,value,valuesize)) == 0 ) { - if ( ptr->value != 0 ) - free(ptr->value), ptr->value = 0; - if ( (ptr->valuesize= valuesize) != 0 ) + if ( cmpval != 0 ) { - ptr->value = (uint8_t *)calloc(1,valuesize); - memcpy(ptr->value,valueptr,valuesize); + if ( ptr->value != 0 ) + free(ptr->value), ptr->value = 0; + if ( (ptr->valuesize= valuesize) != 0 ) + { + ptr->value = (uint8_t *)calloc(1,valuesize); + memcpy(ptr->value,valueptr,valuesize); + } } ptr->height = kmdheight; ptr->flags = flags; diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 113dc7936..2c04a53e0 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -488,6 +488,7 @@ int32_t iguana_rwnum(int32_t rwflag,uint8_t *serialized,int32_t len,void *endian int32_t komodo_isrealtime(int32_t *kmdheightp); int32_t pax_fiatstatus(uint64_t *available,uint64_t *deposited,uint64_t *issued,uint64_t *withdrawn,uint64_t *approved,uint64_t *redeemed,char *base); int32_t komodo_kvsearch(int32_t current_height,uint32_t *flagsp,int32_t *heightp,uint8_t value[IGUANA_MAXSCRIPTSIZE],uint8_t *key,int32_t keylen); +int32_t komodo_kvcmp(uint8_t *refvalue,uint16_t refvaluesize,uint8_t *value,uint16_t valuesize); Value paxdeposit(const Array& params, bool fHelp) { @@ -565,7 +566,7 @@ Value paxwithdraw(const Array& params, bool fHelp) Value kvupdate(const Array& params, bool fHelp) { CWalletTx wtx; Object ret; - uint8_t keyvalue[IGUANA_MAXSCRIPTSIZE],opretbuf[IGUANA_MAXSCRIPTSIZE]; int32_t duration,opretlen,height; uint16_t keylen,valuesize=0; uint8_t *key,*value=0; uint32_t flags,tmpflags; struct komodo_kv *ptr; uint64_t fee; + uint8_t keyvalue[IGUANA_MAXSCRIPTSIZE],opretbuf[IGUANA_MAXSCRIPTSIZE]; int32_t duration,opretlen,height; uint16_t keylen,valuesize=0,refvaluesize=0; uint8_t *key,*value=0; uint32_t flags,tmpflags; struct komodo_kv *ptr; uint64_t fee; if (fHelp || params.size() < 2 ) throw runtime_error("kvupdate key value [flags]"); if (!EnsureWalletIsAvailable(fHelp)) @@ -573,13 +574,18 @@ Value kvupdate(const Array& params, bool fHelp) if ( params.size() == 3 ) { flags = atoi(params[2].get_str().c_str()); - printf("flags.%d (%s)\n",flags,params[2].get_str().c_str()); + //printf("flags.%d (%s)\n",flags,params[2].get_str().c_str()); } else flags = 0; LOCK2(cs_main, pwalletMain->cs_wallet); if ( (keylen= (int32_t)strlen(params[0].get_str().c_str())) > 0 ) { key = (uint8_t *)params[0].get_str().c_str(); - if ( (valuesize= komodo_kvsearch(chainActive.Tip()->nHeight,&tmpflags,&height,&keyvalue[keylen],key,keylen)) >= 0 && (tmpflags & KOMODO_KVPROTECTED) != 0 ) + if ( params.size() >= 2 && params[1].get_str().c_str() != 0 ) + { + value = (uint8_t *)params[1].get_str().c_str(); + valuesize = (int32_t)strlen(params[1].get_str().c_str()); + } + if ( (refvaluesize= komodo_kvsearch(chainActive.Tip()->nHeight,&tmpflags,&height,&keyvalue[keylen],key,keylen)) >= 0 && (tmpflags & KOMODO_KVPROTECTED) != 0 && komodo_kvcmp(refvaluesize==0?0:&keyvalue[keylen],refvaluesize,value,valuesize) != 0 ) { ret.push_back(Pair("error",(char *)"cant modify write once key")); return ret; @@ -594,8 +600,6 @@ Value kvupdate(const Array& params, bool fHelp) ret.push_back(Pair("keylen",(int64_t)keylen)); if ( params.size() >= 2 && params[1].get_str().c_str() != 0 ) { - value = (uint8_t *)params[1].get_str().c_str(); - valuesize = (int32_t)strlen(params[1].get_str().c_str()); ret.push_back(Pair("value",params[1].get_str())); ret.push_back(Pair("valuesize",valuesize)); } From 13382b822d980d2075e62a43bbadd1d8ad5a50fe Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 21 Jan 2017 13:19:33 +0200 Subject: [PATCH 37/40] test --- src/komodo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo.h b/src/komodo.h index e1c62bfa8..40d71f291 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -256,7 +256,7 @@ void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotar errs++; if ( fwrite(opretbuf,1,olen,fp) != olen ) errs++; - //printf("ht.%d R opret[%d]\n",height,olen); +printf("ht.%d R opret[%d] sp.%p\n",height,olen,sp); //komodo_opreturn(height,opretvalue,opretbuf,olen,txhash,vout); komodo_eventadd_opreturn(sp,symbol,height,txhash,opretvalue,vout,opretbuf,olen); } From 28221080bb10fb299e8b0a5a31d72f34c8c1cf72 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 21 Jan 2017 13:21:57 +0200 Subject: [PATCH 38/40] test --- src/komodo_gateway.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index f9d058799..7d80d64cf 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -711,7 +711,7 @@ int32_t komodo_kvcmp(uint8_t *refvalue,uint16_t refvaluesize,uint8_t *value,uint return(-1); else if ( refvaluesize != valuesize ) return(-1); - else return(memcmp(refvalue,value,valuesize); + else return(memcmp(refvalue,value,valuesize)); } const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int32_t opretlen,uint256 txid,uint16_t vout,char *source) @@ -760,7 +760,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 newflag = 1; HASH_ADD_KEYPTR(hh,KOMODO_KV,ptr->key,ptr->keylen,ptr); } - if ( newflag != 0 || (ptr->flags & KOMODO_KVPROTECTED) == 0 || (cmpval= komodo_kvcmp(ptr->value,ptr->valuesize,value,valuesize)) == 0 ) + if ( newflag != 0 || (ptr->flags & KOMODO_KVPROTECTED) == 0 || (cmpval= komodo_kvcmp(ptr->value,ptr->valuesize,valueptr,valuesize)) == 0 ) { if ( cmpval != 0 ) { From 088b1fa80164f65ef80f68179330196875512dab Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 21 Jan 2017 13:26:47 +0200 Subject: [PATCH 39/40] test --- src/komodo.h | 2 +- src/komodo_gateway.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/komodo.h b/src/komodo.h index 40d71f291..f963ab819 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -256,7 +256,7 @@ void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotar errs++; if ( fwrite(opretbuf,1,olen,fp) != olen ) errs++; -printf("ht.%d R opret[%d] sp.%p\n",height,olen,sp); +//printf("ht.%d R opret[%d] sp.%p\n",height,olen,sp); //komodo_opreturn(height,opretvalue,opretbuf,olen,txhash,vout); komodo_eventadd_opreturn(sp,symbol,height,txhash,opretvalue,vout,opretbuf,olen); } diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 7d80d64cf..1ac4165fd 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -718,13 +718,13 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 { uint8_t rmd160[20],rmd160s[64*20],addrtype,shortflag,pubkey33[33]; int32_t didstats,i,j,n,len,tokomodo,kmdheight,otherheights[64],kmdheights[64]; int8_t baseids[64]; char base[4],coinaddr[64],destaddr[64]; uint256 txids[64]; uint16_t vouts[64]; uint64_t convtoshis,seed; int64_t fee,fiatoshis,komodoshis,checktoshis,values[64],srcvalues[64]; struct pax_transaction *pax,*pax2; struct komodo_state *basesp; double diff; uint32_t flags; const char *typestr = "unknown"; - if ( KOMODO_PAX == 0 ) - return("nopax"); - if ( ASSETCHAINS_SYMBOL[0] != 0 && komodo_baseid(ASSETCHAINS_SYMBOL) < 0 ) + if ( ASSETCHAINS_SYMBOL[0] != 0 && komodo_baseid(ASSETCHAINS_SYMBOL) < 0 && opretbuf[0] != 'K' ) { //printf("komodo_opreturn skip %s\n",ASSETCHAINS_SYMBOL); return("assetchain"); } + else if ( KOMODO_PAX == 0 ) + return("nopax"); memset(baseids,0xff,sizeof(baseids)); memset(values,0,sizeof(values)); memset(srcvalues,0,sizeof(srcvalues)); From 96e95a2adc5f49ad3fadb7c7689ecbe432ab7726 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 21 Jan 2017 13:30:28 +0200 Subject: [PATCH 40/40] KV support --- src/komodo_gateway.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 1ac4165fd..35dbba2fa 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -681,7 +681,7 @@ int32_t komodo_kvsearch(int32_t current_height,uint32_t *flagsp,int32_t *heightp if ( ptr != 0 ) { duration = ((ptr->flags >> 2) + 1) * KOMODO_KVDURATION; - printf("duration.%d flags.%d current.%d ht.%d keylen.%d valuesize.%d\n",duration,ptr->flags,current_height,ptr->height,ptr->keylen,ptr->valuesize); + //printf("duration.%d flags.%d current.%d ht.%d keylen.%d valuesize.%d\n",duration,ptr->flags,current_height,ptr->height,ptr->keylen,ptr->valuesize); if ( current_height > (ptr->height + duration) ) { HASH_DELETE(hh,KOMODO_KV,ptr); @@ -744,7 +744,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 if ( (fee= ((flags>>2)+1)*(opretlen * opretlen / keylen)) < 100000 ) fee = 100000; // 6a164b040005006a00000000000000746573743834393333 - printf("fee %.8f vs %.8f flags.%d keylen.%d valuesize.%d height.%d (%02x %02x %02x) (%02x %02x %02x)\n",(double)fee/COIN,(double)value/COIN,flags,keylen,valuesize,kmdheight,key[0],key[1],key[2],valueptr[0],valueptr[1],valueptr[2]); + //printf("fee %.8f vs %.8f flags.%d keylen.%d valuesize.%d height.%d (%02x %02x %02x) (%02x %02x %02x)\n",(double)fee/COIN,(double)value/COIN,flags,keylen,valuesize,kmdheight,key[0],key[1],key[2],valueptr[0],valueptr[1],valueptr[2]); if ( value >= fee ) { if ( sizeof(flags)+sizeof(kmdheight)+sizeof(keylen)+sizeof(valuesize)+keylen+valuesize+1 == opretlen )