Skip to content

Commit ced9380

Browse files
timemarkovqtumNeil
timemarkovqtum
authored and
Neil
committed
Add cancunheight to python tests extra_args
1 parent 88d4ef2 commit ced9380

6 files changed

+9
-9
lines changed

‎test/functional/qtum_evm_constantinople_opcodes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def add_options(self, parser):
1818
def set_test_params(self):
1919
self.setup_clean_chain = True
2020
self.num_nodes = 1
21-
self.extra_args = [['-txindex=1', '-logevents=1', '-constantinopleheight=1000000', '-muirglacierheight=1000000', '-londonheight=1000000', '-shanghaiheight=1000000']]
21+
self.extra_args = [['-txindex=1', '-logevents=1', '-constantinopleheight=1000000', '-muirglacierheight=1000000', '-londonheight=1000000', '-shanghaiheight=1000000', '-cancunheight=100000']]
2222

2323
def skip_test_if_missing_module(self):
2424
self.skip_if_no_wallet()

‎test/functional/qtum_evm_constantinople_precompiles.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def add_options(self, parser):
1818
def set_test_params(self):
1919
self.setup_clean_chain = True
2020
self.num_nodes = 1
21-
self.extra_args = [['-txindex=1', '-logevents=1', '-constantinopleheight=1000000', '-londonheight=1000000', '-shanghaiheight=1000000']]
21+
self.extra_args = [['-txindex=1', '-logevents=1', '-constantinopleheight=1000000', '-londonheight=1000000', '-shanghaiheight=1000000', '-cancunheight=100000']]
2222

2323
def skip_test_if_missing_module(self):
2424
self.skip_if_no_wallet()
@@ -637,7 +637,7 @@ def run_test(self):
637637
# All the old precompiles should still work, as well as the new contracts
638638
switch_height1 = self.node.getblockcount()
639639
self.log.info('Test opcodes after constantinople (height: %s)', switch_height1)
640-
self.restart_node(0, ['-constantinopleheight={}'.format(switch_height1), '-reduceblocktimeheight={}'.format(switch_height1), '-logevents', '-londonheight=1000000', '-shanghaiheight=1000000'])
640+
self.restart_node(0, ['-constantinopleheight={}'.format(switch_height1), '-reduceblocktimeheight={}'.format(switch_height1), '-logevents', '-londonheight=1000000', '-shanghaiheight=1000000', '-cancunheight=100000'])
641641
bytecode = "608060405234801561001057600080fd5b50610ad2806100206000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c8063767f2a8911610071578063767f2a891461041d5780637c1886d91461043b578063a1461eef1461048a578063d826f88f146104a8578063e3c87216146104b2578063fdcd12cb1461056d576100b4565b806312bdedd7146100b95780631a0ffebe146101745780631b08d96f1461022f5780633d9c8fdb1461024d5780635327e29714610308578063652dcd30146103ae575b600080fd5b610172600480360360208110156100cf57600080fd5b81019080803590602001906401000000008111156100ec57600080fd5b8201836020820111156100fe57600080fd5b8035906020019184600183028401116401000000008311171561012057600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f8201169050808301925050505050505091929192905050506105af565b005b61022d6004803603602081101561018a57600080fd5b81019080803590602001906401000000008111156101a757600080fd5b8201836020820111156101b957600080fd5b803590602001918460018302840111640100000000831117156101db57600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f820116905080830192505050505050509192919290505050610659565b005b6102376106ba565b6040518082815260200191505060405180910390f35b6103066004803603602081101561026357600080fd5b810190808035906020019064010000000081111561028057600080fd5b82018360208201111561029257600080fd5b803590602001918460018302840111640100000000831117156102b457600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f8201169050808301925050505050505091929192905050506106c0565b005b6103ac6004803603608081101561031e57600080fd5b8101908080604001906002806020026040519081016040528092919082600260200280828437600081840152601f19601f820116905080830192505050505050919291929080604001906002806020026040519081016040528092919082600260200280828437600081840152601f19601f8201169050808301925050505050509192919290505050610720565b005b61041b600480360360608110156103c457600080fd5b8101908080604001906002806020026040519081016040528092919082600260200280828437600081840152601f19601f8201169050808301925050505050509192919290803590602001909291905050506107d5565b005b61042561087f565b6040518082815260200191505060405180910390f35b6104886004803603608081101561045157600080fd5b8101908080359060200190929190803560ff1690602001909291908035906020019092919080359060200190929190505050610885565b005b61049261090e565b6040518082815260200191505060405180910390f35b6104b0610914565b005b61056b600480360360208110156104c857600080fd5b81019080803590602001906401000000008111156104e557600080fd5b8201836020820111156104f757600080fd5b8035906020019184600183028401116401000000008311171561051957600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050919291929050505061098b565b005b6105ad6004803603606081101561058357600080fd5b81019080803590602001909291908035906020019092919080359060200190929190505050610a28565b005b6002816040518082805190602001908083835b602083106105e557805182526020820191506020810190506020830392506105c2565b6001836020036101000a038019825116818451168082178552505050505050905001915050602060405180830381855afa158015610627573d6000803e3d6000fd5b5050506040513d602081101561063c57600080fd5b810190808051906020019092919050505060001c60008190555050565b600080825190506040516020818360208701600060086107d05a03f1806000811461068757825194506106ab565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff94505b50505081600081905550505050565b60005481565b6000808251905060405181818360208701600060046107d05a03f180600081146106ed5782519450610711565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff94505b50505081600081905550505050565b600080600060809050604051855160008201526020860151602082015284516040820152602085015160608201526040818383600060066107d05a03f180600081146107765782519550602083015194506107bd565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff95507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff94505b50505082600181905550816002819055505050505050565b60008060006060905060405185516000820152602086015160208201528460408201526040818383600060076107d05a03f18060008114610820578251955060208301519450610867565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff95507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff94505b50505082600181905550816002819055505050505050565b60015481565b60018484848460405160008152602001604052604051808581526020018460ff1660ff1681526020018381526020018281526020019450505050506020604051602081039080840390855afa1580156108e2573d6000803e3d6000fd5b5050506020604051035173ffffffffffffffffffffffffffffffffffffffff1660008190555050505050565b60025481565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000819055507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001819055507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600281905550565b6003816040518082805190602001908083835b602083106109c1578051825260208201915060208101905060208303925061099e565b6001836020036101000a038019825116818451168082178552505050505050905001915050602060405180830381855afa158015610a03573d6000803e3d6000fd5b5050506040515160601b6bffffffffffffffffffffffff191660001c60008190555050565b600060405160208152602080820152602060408201528460608201528360808201528260a082015260208160c083600060056107d05a03f18060008114610a725782519350610a96565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff93505b505050806000819055505050505056fea165627a7a7230582067f822d1339f29c535c6013b09d2374c1f589e39e98a74012a3519186ee9b2630029"
642642
self.contract_address = self.node.createcontract(bytecode)['address']
643643
self.node.generate(1)
@@ -668,7 +668,7 @@ def run_test(self):
668668

669669
switch_height2 = self.node.getblockcount()
670670
self.log.info('Test opcodes after london (height: %s)', switch_height2)
671-
self.restart_node(0, ['-constantinopleheight={}'.format(switch_height2), '-reduceblocktimeheight={}'.format(switch_height2), '-logevents', '-londonheight={}'.format(switch_height2), '-shanghaiheight=1000000'])
671+
self.restart_node(0, ['-constantinopleheight={}'.format(switch_height2), '-reduceblocktimeheight={}'.format(switch_height2), '-logevents', '-londonheight={}'.format(switch_height2), '-shanghaiheight=1000000', '-cancunheight=100000'])
672672
bytecode = "608060405234801561001057600080fd5b50610ad2806100206000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c8063767f2a8911610071578063767f2a891461041d5780637c1886d91461043b578063a1461eef1461048a578063d826f88f146104a8578063e3c87216146104b2578063fdcd12cb1461056d576100b4565b806312bdedd7146100b95780631a0ffebe146101745780631b08d96f1461022f5780633d9c8fdb1461024d5780635327e29714610308578063652dcd30146103ae575b600080fd5b610172600480360360208110156100cf57600080fd5b81019080803590602001906401000000008111156100ec57600080fd5b8201836020820111156100fe57600080fd5b8035906020019184600183028401116401000000008311171561012057600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f8201169050808301925050505050505091929192905050506105af565b005b61022d6004803603602081101561018a57600080fd5b81019080803590602001906401000000008111156101a757600080fd5b8201836020820111156101b957600080fd5b803590602001918460018302840111640100000000831117156101db57600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f820116905080830192505050505050509192919290505050610659565b005b6102376106ba565b6040518082815260200191505060405180910390f35b6103066004803603602081101561026357600080fd5b810190808035906020019064010000000081111561028057600080fd5b82018360208201111561029257600080fd5b803590602001918460018302840111640100000000831117156102b457600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f8201169050808301925050505050505091929192905050506106c0565b005b6103ac6004803603608081101561031e57600080fd5b8101908080604001906002806020026040519081016040528092919082600260200280828437600081840152601f19601f820116905080830192505050505050919291929080604001906002806020026040519081016040528092919082600260200280828437600081840152601f19601f8201169050808301925050505050509192919290505050610720565b005b61041b600480360360608110156103c457600080fd5b8101908080604001906002806020026040519081016040528092919082600260200280828437600081840152601f19601f8201169050808301925050505050509192919290803590602001909291905050506107d5565b005b61042561087f565b6040518082815260200191505060405180910390f35b6104886004803603608081101561045157600080fd5b8101908080359060200190929190803560ff1690602001909291908035906020019092919080359060200190929190505050610885565b005b61049261090e565b6040518082815260200191505060405180910390f35b6104b0610914565b005b61056b600480360360208110156104c857600080fd5b81019080803590602001906401000000008111156104e557600080fd5b8201836020820111156104f757600080fd5b8035906020019184600183028401116401000000008311171561051957600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050919291929050505061098b565b005b6105ad6004803603606081101561058357600080fd5b81019080803590602001909291908035906020019092919080359060200190929190505050610a28565b005b6002816040518082805190602001908083835b602083106105e557805182526020820191506020810190506020830392506105c2565b6001836020036101000a038019825116818451168082178552505050505050905001915050602060405180830381855afa158015610627573d6000803e3d6000fd5b5050506040513d602081101561063c57600080fd5b810190808051906020019092919050505060001c60008190555050565b600080825190506040516020818360208701600060086107d05a03f1806000811461068757825194506106ab565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff94505b50505081600081905550505050565b60005481565b6000808251905060405181818360208701600060046107d05a03f180600081146106ed5782519450610711565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff94505b50505081600081905550505050565b600080600060809050604051855160008201526020860151602082015284516040820152602085015160608201526040818383600060066107d05a03f180600081146107765782519550602083015194506107bd565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff95507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff94505b50505082600181905550816002819055505050505050565b60008060006060905060405185516000820152602086015160208201528460408201526040818383600060076107d05a03f18060008114610820578251955060208301519450610867565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff95507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff94505b50505082600181905550816002819055505050505050565b60015481565b60018484848460405160008152602001604052604051808581526020018460ff1660ff1681526020018381526020018281526020019450505050506020604051602081039080840390855afa1580156108e2573d6000803e3d6000fd5b5050506020604051035173ffffffffffffffffffffffffffffffffffffffff1660008190555050505050565b60025481565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000819055507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001819055507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600281905550565b6003816040518082805190602001908083835b602083106109c1578051825260208201915060208101905060208303925061099e565b6001836020036101000a038019825116818451168082178552505050505050905001915050602060405180830381855afa158015610a03573d6000803e3d6000fd5b5050506040515160601b6bffffffffffffffffffffffff191660001c60008190555050565b600060405160208152602080820152602060408201528460608201528360808201528260a082015260208160c083600060056107d05a03f18060008114610a725782519350610a96565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff93505b505050806000819055505050505056fea165627a7a7230582067f822d1339f29c535c6013b09d2374c1f589e39e98a74012a3519186ee9b2630029"
673673
self.contract_address = self.node.createcontract(bytecode)['address']
674674
self.node.generate(1)
@@ -699,7 +699,7 @@ def run_test(self):
699699

700700
switch_height3 = self.node.getblockcount()
701701
self.log.info('Test opcodes after shanghai (height: %s)', switch_height3)
702-
self.restart_node(0, ['-constantinopleheight={}'.format(switch_height3), '-reduceblocktimeheight={}'.format(switch_height3), '-logevents', '-londonheight={}'.format(switch_height3), '-shanghaiheight={}'.format(switch_height3)])
702+
self.restart_node(0, ['-constantinopleheight={}'.format(switch_height3), '-reduceblocktimeheight={}'.format(switch_height3), '-logevents', '-londonheight={}'.format(switch_height3), '-shanghaiheight={}'.format(switch_height3), '-cancunheight={}'.format(switch_height3)])
703703
bytecode = "608060405234801561001057600080fd5b50610ad2806100206000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c8063767f2a8911610071578063767f2a891461041d5780637c1886d91461043b578063a1461eef1461048a578063d826f88f146104a8578063e3c87216146104b2578063fdcd12cb1461056d576100b4565b806312bdedd7146100b95780631a0ffebe146101745780631b08d96f1461022f5780633d9c8fdb1461024d5780635327e29714610308578063652dcd30146103ae575b600080fd5b610172600480360360208110156100cf57600080fd5b81019080803590602001906401000000008111156100ec57600080fd5b8201836020820111156100fe57600080fd5b8035906020019184600183028401116401000000008311171561012057600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f8201169050808301925050505050505091929192905050506105af565b005b61022d6004803603602081101561018a57600080fd5b81019080803590602001906401000000008111156101a757600080fd5b8201836020820111156101b957600080fd5b803590602001918460018302840111640100000000831117156101db57600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f820116905080830192505050505050509192919290505050610659565b005b6102376106ba565b6040518082815260200191505060405180910390f35b6103066004803603602081101561026357600080fd5b810190808035906020019064010000000081111561028057600080fd5b82018360208201111561029257600080fd5b803590602001918460018302840111640100000000831117156102b457600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f8201169050808301925050505050505091929192905050506106c0565b005b6103ac6004803603608081101561031e57600080fd5b8101908080604001906002806020026040519081016040528092919082600260200280828437600081840152601f19601f820116905080830192505050505050919291929080604001906002806020026040519081016040528092919082600260200280828437600081840152601f19601f8201169050808301925050505050509192919290505050610720565b005b61041b600480360360608110156103c457600080fd5b8101908080604001906002806020026040519081016040528092919082600260200280828437600081840152601f19601f8201169050808301925050505050509192919290803590602001909291905050506107d5565b005b61042561087f565b6040518082815260200191505060405180910390f35b6104886004803603608081101561045157600080fd5b8101908080359060200190929190803560ff1690602001909291908035906020019092919080359060200190929190505050610885565b005b61049261090e565b6040518082815260200191505060405180910390f35b6104b0610914565b005b61056b600480360360208110156104c857600080fd5b81019080803590602001906401000000008111156104e557600080fd5b8201836020820111156104f757600080fd5b8035906020019184600183028401116401000000008311171561051957600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050919291929050505061098b565b005b6105ad6004803603606081101561058357600080fd5b81019080803590602001909291908035906020019092919080359060200190929190505050610a28565b005b6002816040518082805190602001908083835b602083106105e557805182526020820191506020810190506020830392506105c2565b6001836020036101000a038019825116818451168082178552505050505050905001915050602060405180830381855afa158015610627573d6000803e3d6000fd5b5050506040513d602081101561063c57600080fd5b810190808051906020019092919050505060001c60008190555050565b600080825190506040516020818360208701600060086107d05a03f1806000811461068757825194506106ab565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff94505b50505081600081905550505050565b60005481565b6000808251905060405181818360208701600060046107d05a03f180600081146106ed5782519450610711565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff94505b50505081600081905550505050565b600080600060809050604051855160008201526020860151602082015284516040820152602085015160608201526040818383600060066107d05a03f180600081146107765782519550602083015194506107bd565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff95507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff94505b50505082600181905550816002819055505050505050565b60008060006060905060405185516000820152602086015160208201528460408201526040818383600060076107d05a03f18060008114610820578251955060208301519450610867565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff95507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff94505b50505082600181905550816002819055505050505050565b60015481565b60018484848460405160008152602001604052604051808581526020018460ff1660ff1681526020018381526020018281526020019450505050506020604051602081039080840390855afa1580156108e2573d6000803e3d6000fd5b5050506020604051035173ffffffffffffffffffffffffffffffffffffffff1660008190555050505050565b60025481565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000819055507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001819055507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600281905550565b6003816040518082805190602001908083835b602083106109c1578051825260208201915060208101905060208303925061099e565b6001836020036101000a038019825116818451168082178552505050505050905001915050602060405180830381855afa158015610a03573d6000803e3d6000fd5b5050506040515160601b6bffffffffffffffffffffffff191660001c60008190555050565b600060405160208152602080820152602060408201528460608201528360808201528260a082015260208160c083600060056107d05a03f18060008114610a725782519350610a96565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff93505b505050806000819055505050505056fea165627a7a7230582067f822d1339f29c535c6013b09d2374c1f589e39e98a74012a3519186ee9b2630029"
704704
self.contract_address = self.node.createcontract(bytecode)['address']
705705
self.node.generate(1)

0 commit comments

Comments
 (0)