From b12ba8b7b5febf322e35f1213b799cdadb8b354a Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 29 Nov 2016 22:45:22 -0300 Subject: [PATCH] test --- iguana/iguana777.h | 4 ++++ iguana/iguana_notary.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/iguana/iguana777.h b/iguana/iguana777.h index 40a731585..313046c03 100755 --- a/iguana/iguana777.h +++ b/iguana/iguana777.h @@ -13,6 +13,10 @@ * * ******************************************************************************/ +/* + adding assetchain coin: copy genCOIN to SuperNET/iguana/coins, make a _7776 variant with RELAY=-1 and VALIDATE=0 + */ + #ifndef iguana777_net_h #define iguana777_net_h diff --git a/iguana/iguana_notary.c b/iguana/iguana_notary.c index 4747617c5..f9a47eaba 100755 --- a/iguana/iguana_notary.c +++ b/iguana/iguana_notary.c @@ -241,10 +241,16 @@ TWO_STRINGS(iguana,dpow,symbol,pubkey) if ( myinfo->numdpows > 1 ) { if ( strcmp(symbol,"KMD") == 0 || iguana_coinfind("BTC") == 0 ) + { + dp->symbol[0] = 0; return(clonestr("{\"error\":\"cant dPoW KMD or BTC again\"}")); + } for (i=1; inumdpows; i++) if ( strcmp(symbol,myinfo->DPOWS[i].symbol) == 0 ) + { + dp->symbol[0] = 0; return(clonestr("{\"error\":\"cant dPoW same coin again\"}")); + } } strcpy(dp->symbol,symbol); if ( strcmp(dp->symbol,"KMD") == 0 ) @@ -262,7 +268,10 @@ TWO_STRINGS(iguana,dpow,symbol,pubkey) src = iguana_coinfind(dp->symbol); dest = iguana_coinfind(dp->dest); if ( src == 0 || dest == 0 ) + { + dp->symbol[0] = 0; return(clonestr("{\"error\":\"source coin or dest coin not there\"}")); + } char tmp[67]; safecopy(tmp,pubkey,sizeof(tmp)); decode_hex(dp->minerkey33,33,tmp); @@ -274,9 +283,15 @@ TWO_STRINGS(iguana,dpow,symbol,pubkey) printf("%02x",dp->minerkey33[i]); printf(" DPOW with pubkey.(%s) %s.valid%d %s -> %s %s.valid%d\n",tmp,srcaddr,srcvalid,dp->symbol,dp->dest,destaddr,destvalid); if ( srcvalid <= 0 || destvalid <= 0 ) + { + dp->symbol[0] = 0; return(clonestr("{\"error\":\"source address or dest address has no privkey, importprivkey\"}")); + } if ( bitcoin_pubkeylen(dp->minerkey33) <= 0 ) + { + dp->symbol[0] = 0; return(clonestr("{\"error\":\"illegal pubkey\"}")); + } if ( dp->blocks == 0 ) { dp->maxblocks = 100000;