From e3cd34a4d1d263f0a24c886397cf62e92806fc9e Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 12 Sep 2018 03:58:04 -1100 Subject: [PATCH] Test --- src/cc/CCGateways.h | 2 +- src/cc/gateways.cpp | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/cc/CCGateways.h b/src/cc/CCGateways.h index e7ab74601..f0c094080 100644 --- a/src/cc/CCGateways.h +++ b/src/cc/CCGateways.h @@ -25,7 +25,7 @@ std::string GatewaysBind(uint64_t txfee,std::string coin,uint256 tokenid,int64_t std::string GatewaysDeposit(uint64_t txfee,uint256 bindtxid,int32_t height,std::string refcoin,uint256 cointxid,int32_t claimvout,std::string deposithex,std::vectorproof,CPubKey destpub,int64_t amount); std::string GatewaysClaim(uint64_t txfee,uint256 bindtxid,std::string refcoin,uint256 deposittxid,CPubKey destpub,int64_t amount); std::string GatewaysWithdraw(uint64_t txfee,uint256 bindtxid,std::string refcoin,std::vector withdrawpub,int64_t amount); -UniValue GatewaysPendingWithdraws(std::string refcoin,uint256 bindtxid); +UniValue GatewaysPendingWithdraws(uint256 bindtxid,std::string refcoin); // CCcustom UniValue GatewaysInfo(uint256 bindtxid); diff --git a/src/cc/gateways.cpp b/src/cc/gateways.cpp index 58289d61c..6450b3c90 100644 --- a/src/cc/gateways.cpp +++ b/src/cc/gateways.cpp @@ -125,6 +125,12 @@ string oracles ef3cc452da006eb2edda6b6ed3d3347664be51260f3e91f59ec44ec9701367f0 Now there is a withdraw pending, so it needs to be processed by the signing nodes on the KMD side + + gatewayspending bindtxid coin + gatewayspending will display all pending withdraws and if it is done on one of the msigpubkeys, then it will queue it for processing + ./c gatewayspending e6c99f79d4afb216aa8063658b4222edb773dd24bb0f8e91bd4ef341f3e47e5e KMD + + */ @@ -758,7 +764,7 @@ std::string GatewaysWithdraw(uint64_t txfee,uint256 bindtxid,std::string refcoin return(""); } -UniValue GatewaysPendingWithdraws(std::string refcoin,uint256 bindtxid) +UniValue GatewaysPendingWithdraws(uint256 bindtxid,std::string refcoin) { UniValue result(UniValue::VOBJ),pending(UniValue::VARR),obj(UniValue::VOBJ); CTransaction tx; std::string coin; CPubKey mypk,gatewayspk; std::vector msigpubkeys; uint256 hashBlock,assetid,txid,oracletxid; uint8_t M,N,taddr,prefix,prefix2; char depositaddr[64],withmarker[64],coinaddr[64],destaddr[64],str[65],withaddr[64],numstr[32]; int32_t i,n,numvouts,vout,numqueued,queueflag; int64_t totalsupply; struct CCcontract_info *cp,C; std::vector > unspentOutputs;