GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-20 13:37:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Consensus: Add asset type to CTxOut and validation

Browse source
This commit is contained in:
Gregory Sanders 2016-12-01 09:34:31 -05:00
parent c63b8e9803
commit 05bc6db085
19 changed files with 196 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/wallet/rpcwallet.cpp
View file

@ -2991,8 +2991,10 @@ UniValue claimpegin(const UniValue& params, bool fHelp)
if (value > MAX_MONEY / 200)
throw JSONRPCError(RPC_VERIFY_REJECTED, "IsStandard rules prevent pegging-in > 0.105 million BTC reliably at a time - please work with your functionary to mine a large lock-merge transaction first");
uint256 bitcoinID(BITCOINID);
//Pad the locked outputs by the IsStandard lock dust value
CTxOut dummyTxOut(0, relock_spk);
CTxOut dummyTxOut(bitcoinID, 0, relock_spk);
CAmount lockDust(dummyTxOut.GetDustThreshold(withdrawLockTxFee));
LOCK(cs_main);
@ -3006,7 +3008,7 @@ UniValue claimpegin(const UniValue& params, bool fHelp)
mtxn.vin.push_back(CTxIn(lockedUTXO[0].first.hash, lockedUTXO[0].first.n, CScript(), ~(uint32_t)0));
mtxn.vin.push_back(CTxIn(lockedUTXO[1].first.hash, lockedUTXO[1].first.n, CScript(), ~(uint32_t)0));
CAmount out_value = lockedUTXO[0].second + lockedUTXO[1].second;
mtxn.vout.push_back(CTxOut(out_value, relock_spk));
mtxn.vout.push_back(CTxOut(bitcoinID, out_value, relock_spk));
CValidationState state;
bool fMissingInputs;
@ -3034,8 +3036,8 @@ UniValue claimpegin(const UniValue& params, bool fHelp)
//Build the transaction
CMutableTransaction mtxn;
CTxIn txin(utxo_txid, utxo_vout, scriptSig, ~(uint32_t)0);
CTxOut txout(value, GetScriptForDestination(sidechainAddress.Get()));
CTxOut txrelock(utxo_value - value, relock_spk);
CTxOut txout(bitcoinID, value, GetScriptForDestination(sidechainAddress.Get()));
CTxOut txrelock(bitcoinID, utxo_value - value, relock_spk);
mtxn.vin.push_back(txin);
mtxn.vout.push_back(txout);
mtxn.vout.push_back(txrelock);