From 82fd1939be4e8a6002dd9f5a6b39e7b1770082e9 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 17 Mar 2017 17:09:33 +0200 Subject: [PATCH] Test --- src/wallet/rpcwallet.cpp | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 46e0532c9..e931e96a4 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -496,8 +496,6 @@ uint256 komodo_kvsig(uint8_t *buf,int32_t len,uint256 privkey); int32_t komodo_kvduration(uint32_t flags); uint256 komodo_kvprivkey(uint256 *pubkeyp,char *passphrase); int32_t komodo_kvsigverify(uint8_t *buf,int32_t len,uint256 _pubkey,uint256 sig); -uint64_t komodo_maxallowed(int32_t baseid); -int32_t komodo_baseid(char *origbase); Value kvupdate(const Array& params, bool fHelp) { @@ -629,30 +627,12 @@ Value paxdeposit(const Array& params, bool fHelp) CBitcoinAddress address(params[0].get_str()); if (!address.IsValid()) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address"); - int32_t baseid,errflag = 0; int64_t netliability,maxval,maxallowed,fiatoshis = atof(params[1].get_str().c_str()) * COIN; + int64_t fiatoshis = atof(params[1].get_str().c_str()) * COIN; std::string base = params[2].get_str(); std::string dest; height = chainActive.Tip()->nHeight; - baseid = komodo_baseid((char *)base.c_str()); - /*if ( pax_fiatstatus(&available,&deposited,&issued,&withdrawn,&approved,&redeemed,(char *)base.c_str()) != 0 ) - errflag = 1; - else - { - maxval = approved; - if ( withdrawn > maxval ) - maxval = withdrawn; - if ( redeemed > maxval ) - maxval = redeemed; - netliability = (deposited - maxval); - maxallowed = komodo_maxallowed(baseid); - if ( fiatoshis > netliability ) - { - fprintf(stderr,"fiatoshis %llu > (max %llu - net %llu)\n",(long long)fiatoshis,(long long)maxallowed,(long long)netliability); - errflag = 1; - } - } - if ( errflag != 0 ) - throw runtime_error("paxdeposit not enough available inventory");*/ + if ( pax_fiatstatus(&available,&deposited,&issued,&withdrawn,&approved,&redeemed,(char *)base.c_str()) != 0 || available < fiatoshis ) + throw runtime_error("paxdeposit not enough available inventory"); komodoshis = PAX_fiatdest(&seed,0,destaddr,pubkey37,(char *)params[0].get_str().c_str(),height,(char *)base.c_str(),fiatoshis); dest.append(destaddr); CBitcoinAddress destaddress(CRYPTO777_KMDADDR);