Skip to content

Add an option to use specific address as a source of funds in protx rpc commands (otherwise use payoutAddress/operatorPayoutAddress) #2581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Dec 28, 2018
Merged

Add an option to use specific address as a source of funds in protx rpc commands (otherwise use payoutAddress/operatorPayoutAddress) #2581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
efaa704
Add an option to use specific address as a source of funds in protx r…
UdjinM6 Dec 25, 2018
abbb7d5
fix typo "must"
UdjinM6 Dec 27, 2018
bd21685
Always use payoutAddress (or operatorPayoutAddress) as a default if n…
UdjinM6 Dec 27, 2018
48ab1be
make sure we actually selected some inputs
UdjinM6 Dec 27, 2018
1566b94
fundAddress -> feeSourceAddress
UdjinM6 Dec 27, 2018
e3cec37
Align help text with new logic
UdjinM6 Dec 27, 2018
8fdc2a0
fix protx_update_service
UdjinM6 Dec 27, 2018
f542d11
fix protx_revoke
UdjinM6 Dec 27, 2018
6aa13fc
Add fRequireAllInputs to CCoinControl and use it in FundSpecialTx
codablock Dec 27, 2018
6f88fc5
Allow to specify empty operator payout address and simplify fee code …
codablock Dec 27, 2018
239e7f3
Specify source for funds and fees in DIP3 tests
codablock Dec 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions qa/rpc-tests/dip3-deterministicmns.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,7 @@ def create_mn_protx_base(self, node, idx, alias, legacy_mn_key):
mn.p2p_port = p2p_port(mn.idx)

blsKey = node.bls('generate')
mn.fundsAddr = node.getnewaddress()
mn.ownerAddr = node.getnewaddress()
mn.operatorAddr = blsKey['public']
mn.votingAddr = mn.ownerAddr
Expand All @@ -426,9 +427,11 @@ def create_mn_protx_base(self, node, idx, alias, legacy_mn_key):
# create a protx MN and also fund it (using collateral inside ProRegTx)
def create_mn_protx_fund(self, node, idx, alias, legacy_mn_key=None):
mn = self.create_mn_protx_base(node, idx, alias, legacy_mn_key=legacy_mn_key)
node.sendtoaddress(mn.fundsAddr, 1000.001)

mn.collateral_address = node.getnewaddress()

mn.protx_hash = node.protx('register_fund', mn.collateral_address, '127.0.0.1:%d' % mn.p2p_port, mn.ownerAddr, mn.operatorAddr, mn.votingAddr, 0, mn.collateral_address)
mn.protx_hash = node.protx('register_fund', mn.collateral_address, '127.0.0.1:%d' % mn.p2p_port, mn.ownerAddr, mn.operatorAddr, mn.votingAddr, 0, mn.collateral_address, mn.fundsAddr)
mn.collateral_txid = mn.protx_hash
mn.collateral_vout = -1

Expand All @@ -444,9 +447,11 @@ def create_mn_protx_fund(self, node, idx, alias, legacy_mn_key=None):
# create a protx MN which refers to an existing collateral
def create_mn_protx(self, node, idx, alias, collateral_txid, collateral_vout, legacy_mn_key=None):
mn = self.create_mn_protx_base(node, idx, alias, legacy_mn_key=legacy_mn_key)
node.sendtoaddress(mn.fundsAddr, 0.001)

mn.rewards_address = node.getnewaddress()

mn.protx_hash = node.protx('register', collateral_txid, collateral_vout, '127.0.0.1:%d' % mn.p2p_port, mn.ownerAddr, mn.operatorAddr, mn.votingAddr, 0, mn.rewards_address)
mn.protx_hash = node.protx('register', collateral_txid, collateral_vout, '127.0.0.1:%d' % mn.p2p_port, mn.ownerAddr, mn.operatorAddr, mn.votingAddr, 0, mn.rewards_address, mn.fundsAddr)
mn.collateral_txid = collateral_txid
mn.collateral_vout = collateral_vout

Expand Down Expand Up @@ -476,14 +481,16 @@ def upgrade_mn_protx(self, mn, refund):
return mn

def update_mn_payee(self, mn, payee):
self.nodes[0].protx('update_registrar', mn.protx_hash, '', '', payee)
self.nodes[0].sendtoaddress(mn.fundsAddr, 0.001)
self.nodes[0].protx('update_registrar', mn.protx_hash, '', '', payee, mn.fundsAddr)
self.nodes[0].generate(1)
self.sync_all()
info = self.nodes[0].protx('info', mn.protx_hash)
assert(info['state']['payoutAddress'] == payee)

def test_protx_update_service(self, mn):
self.nodes[0].protx('update_service', mn.protx_hash, '127.0.0.2:%d' % mn.p2p_port, mn.blsMnkey)
self.nodes[0].sendtoaddress(mn.fundsAddr, 0.001)
self.nodes[0].protx('update_service', mn.protx_hash, '127.0.0.2:%d' % mn.p2p_port, mn.blsMnkey, "", mn.fundsAddr)
self.nodes[0].generate(1)
self.sync_all()
for node in self.nodes:
Expand All @@ -493,7 +500,7 @@ def test_protx_update_service(self, mn):
assert_equal(mn_list['%s-%d' % (mn.collateral_txid, mn.collateral_vout)]['address'], '127.0.0.2:%d' % mn.p2p_port)

# undo
self.nodes[0].protx('update_service', mn.protx_hash, '127.0.0.1:%d' % mn.p2p_port, mn.blsMnkey)
self.nodes[0].protx('update_service', mn.protx_hash, '127.0.0.1:%d' % mn.p2p_port, mn.blsMnkey, "", mn.fundsAddr)
self.nodes[0].generate(1)

def force_finish_mnsync(self, node):
Expand Down Expand Up @@ -732,16 +739,20 @@ def wait_for_mnlists_same(self, timeout=30):

def test_fail_create_protx(self, node):
# Try to create ProTx (should still fail)
fund_address = node.getnewaddress()
address = node.getnewaddress()
node.sendtoaddress(fund_address, 1000.001) # +0.001 for fees
key = node.getnewaddress()
blsKey = node.bls('generate')
assert_raises_jsonrpc(None, "bad-tx-type", node.protx, 'register_fund', address, '127.0.0.1:10000', key, blsKey['public'], key, 0, address)
assert_raises_jsonrpc(None, "bad-tx-type", node.protx, 'register_fund', address, '127.0.0.1:10000', key, blsKey['public'], key, 0, address, fund_address)

def test_success_create_protx(self, node):
fund_address = node.getnewaddress()
address = node.getnewaddress()
txid = node.sendtoaddress(fund_address, 1000.001) # +0.001 for fees
key = node.getnewaddress()
blsKey = node.bls('generate')
txid = node.protx('register_fund', address, '127.0.0.1:10000', key, blsKey['public'], key, 0, address)
node.protx('register_fund', address, '127.0.0.1:10000', key, blsKey['public'], key, 0, address, fund_address)
rawtx = node.getrawtransaction(txid, 1)
self.mine_double_spend(node, rawtx['vin'], address, use_mnmerkleroot_from_tip=True)
self.sync_all()
Expand Down
Loading