Merge pull request #210 from jl777/dev

Dev

iguana/iguana_notary.c

@@ -464,7 +464,7 @@ STRING_AND_INT(dpow,fundnotaries,symbol,numblocks)
     {
         if ( numblocks == 0 )
             numblocks = 10000;
-        else sendflag = 1;
+        //else sendflag = 1;
         memset(vals,0,sizeof(vals));
         if ( (coin= iguana_coinfind("BTC")) != 0 )
         {

iguana/iguana_payments.c

@@ -680,7 +680,7 @@ INT_ARRAY_STRING(bitcoinrpc,createmultisig,M,pubkeys,ignore)
     if ( n < 0 || n > 16 || M < 0 || M > n )
         return(clonestr("{\"error\":\"illegal number of pubkeys\"}"));
     memset(&V,0,sizeof(V));
-    printf("create M.%d of N.%d (%s)\n",M,n,jprint(pubkeys,0));
+    //printf("create M.%d of N.%d (%s)\n",M,n,jprint(pubkeys,0));
     V.M = M, V.N = n;
     pkjson = cJSON_CreateArray();
     addresses = cJSON_CreateArray();
@@ -717,7 +717,7 @@ INT_ARRAY_STRING(bitcoinrpc,createmultisig,M,pubkeys,ignore)
         jaddstr(retjson,"error","couldnt get all pubkeys");
         free_json(pkjson);
     }
-    printf("CREATEMULTISIG.(%s)\n",jprint(retjson,0));
+    //printf("CREATEMULTISIG.(%s)\n",jprint(retjson,0));
     return(jprint(retjson,1));
 }
 

iguana/iguana_rpc.c

@@ -398,6 +398,11 @@ static char *dumpprivkey(RPCARGS)
     return(sglue1(0,CALLGLUE,"bitcoinrpc","dumpprivkey","address",params[0]));
 }
 
+static char *importaddress(RPCARGS)
+{
+    return(sglue3(0,CALLGLUE,"bitcoinrpc","importaddress","address",params[0],"account",params[1],"rescan",params[2]));
+}
+
 static char *importprivkey(RPCARGS)
 {
     return(sglue3(0,CALLGLUE,"bitcoinrpc","importprivkey","wif",params[0],"account",params[1],"rescan",params[2]));
@@ -612,6 +617,7 @@ struct RPC_info { char *name; char *(*rpcfunc)(RPCARGS); int32_t flag0,remotefla
     { "dumpwallet",             &dumpwallet,             true,   false },
     { "importwallet",           &importwallet,           false,  false },
     { "importprivkey",          &importprivkey,          false,  false },
+    { "importaddress",          &importaddress,          false,  false },
     { "getrawtransaction",      &getrawtransaction,      false,  false },
     { "createrawtransaction",   &createrawtransaction,   false,  false },
     { "validaterawtransaction", &validaterawtransaction,   false,  true },

iguana/iguana_wallet.c

@@ -1464,6 +1464,19 @@ FOUR_STRINGS(bitcoinrpc,walletpassphrasechange,oldpassword,newpassword,oldperman
     return(retstr);
 }
 
+TWOSTRINGS_AND_INT(bitcoinrpc,importaddress,address,account,rescan)
+{
+    if ( remoteaddr != 0 )
+        return(clonestr("{\"error\":\"no remote\"}"));
+    if ( coin != 0 && coin->notarychain >= 0 && coin->FULLNODE == 0 && address != 0 && account != 0 )
+    {
+        if ( strcmp(address,account) != 0 )
+            return(clonestr("{\"error\":\"only special account == address supported\"}"));
+        else return(_dex_importaddress(myinfo,coin->symbol,address));
+    }
+    return(0);
+}
+
 TWOSTRINGS_AND_INT(bitcoinrpc,importprivkey,wif,account,rescan)
 {
     bits256 privkey; char *retstr,*str; cJSON *retjson; struct iguana_waddress addr,*waddr; struct iguana_waccount *wacct = 0; uint8_t type,redeemScript[4096]; int32_t len; struct vin_info V; bits256 debugtxid;

iguana/tests/deximportaddress

@@ -1,4 +1,4 @@
 #!/bin/bash
-curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"1Hgzt5xsnbfc8UTWqWKSTLRm5bEYHYBoCE\",\"symbol\":\"BTC\"}"
-curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RRyBxbrAPRUBCUpiJgJZYrkxqrh8x5ta9Z\",\"symbol\":\"USD\"}"
-curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RRyBxbrAPRUBCUpiJgJZYrkxqrh8x5ta9Z\",\"symbol\":\"MVP\"}"
+#curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"1Hgzt5xsnbfc8UTWqWKSTLRm5bEYHYBoCE\",\"symbol\":\"BTC\"}"
+#curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RRyBxbrAPRUBCUpiJgJZYrkxqrh8x5ta9Z\",\"symbol\":\"USD\"}"
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"bXQu4vm7gJcBvBXDiNU3eyAVrhW44wzCYW\",\"symbol\":\"SHARK\"}"

iguana/tests/dexlistunspent

@@ -1,2 +1,2 @@
 #!/bin/bash
-curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RRyBxbrAPRUBCUpiJgJZYrkxqrh8x5ta9Z\",\"symbol\":\"MVP\"}"
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"bXQu4vm7gJcBvBXDiNU3eyAVrhW44wzCYW\",\"symbol\":\"SHARK\"}"

includes/iguana_apideclares.h

@@ -124,6 +124,7 @@ STRING_ARG(bitcoinrpc,backupwallet,filename);
 STRING_ARG(bitcoinrpc,importwallet,filename);
 STRING_ARG(bitcoinrpc,getnewaddress,account);
 TWOSTRINGS_AND_INT(bitcoinrpc,importprivkey,wif,account,rescan);
+TWOSTRINGS_AND_INT(bitcoinrpc,importaddress,address,account,rescan);
 STRING_ARG(bitcoinrpc,dumpprivkey,address);
 
 STRING_AND_THREEINTS(bitcoinrpc,listtransactions,account,count,skip,includewatchonly);