fixups for matchoffer, blindraw

kallewoof · Jul 30, 2017 · 5fc11c9 · 5fc11c9
1 parent 156aafa
commit 5fc11c9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
@@ -936,7 +936,7 @@ UniValue blindrawtransaction(const JSONRPCRequest& request)
     for (size_t nIn = 0; nIn < tx.vin.size(); nIn++) {
 
         std::map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.find(tx.vin[nIn].prevout.hash);
-        if (it == pwalletMain->mapWallet.end()) {
+        if (it == pwalletMain->mapWallet.end() || pwalletMain->IsMine(tx.vin[nIn]) == ISMINE_NO) {
             // For inputs we don't own input assetcommitments for the surjection must be supplied
             if (auxiliary_generators.size() > 0) {
                 input_blinds.push_back(uint256());

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
@@ -3665,7 +3665,7 @@ UniValue makeoffer(const JSONRPCRequest& request)
     addrHash.push_back(Pair(addrTmp.get_str(), ValueFromAmount(sellAmount))); // sold amount
     outputAssets.push_back(Pair(addrTmp.get_str(), sellAsset));
     r.params.push_back(addrHash);
-    r.params.push_back((int32_t)0);
+    r.params.push_back(UniValue(0));
     r.params.push_back(outputAssets);
     printf("r = %s\n", r.params.write().c_str());
     UniValue rtx = createrawtransaction(r);
@@ -3896,7 +3896,7 @@ UniValue matchoffer(const JSONRPCRequest& request)
     addrHash.push_back(Pair(addrTmp.get_str(), ValueFromAmount(sellAmount))); // sold amount
     outputAssets.push_back(Pair(addrTmp.get_str(), sellAsset));
     r.params.push_back(addrHash);
-    r.params.push_back((int32_t)0);
+    r.params.push_back(UniValue(0));
     r.params.push_back(outputAssets);
     printf("r = %s\n", r.params.write().c_str());
     UniValue rtx = createrawtransaction(r);