Skip to content
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

Jump to bottom

Re-compile test contracts with Solidity v0.8.22 #3134

Merged
merged 3 commits into from
Oct 25, 2023
Merged

Re-compile test contracts with Solidity v0.8.22 #3134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a748d53
Re-compile test contracts with Solidity v0.8.22
fselmo Oct 25, 2023
7876122
re-generate integration test fixture with updated contract bytecode
fselmo Oct 25, 2023
84770f2
Add newsfragment for PR #3134
fselmo Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions newsfragments/3134.internal.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Re-compile test contracts with Solidity ``v0.8.22`` to ensure compatibility with this latest Solidity version.
Binary file modified tests/integration/geth-1.11.6-fixture.zip
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions web3/_utils/contract_sources/contract_data/arrays_contract.py
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions web3/_utils/contract_sources/contract_data/bytes_contracts.py
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions web3/_utils/contract_sources/contract_data/constructor_contracts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
"""
Generated by `compile_contracts.py` script.
Compiled with Solidity v0.8.21.
Compiled with Solidity v0.8.22.
"""

# source: web3/_utils/contract_sources/ConstructorContracts.sol:SimpleConstructorContract # noqa: E501
SIMPLE_CONSTRUCTOR_CONTRACT_BYTECODE = "0x6080604052348015600e575f80fd5b50603e80601a5f395ff3fe60806040525f80fdfea2646970667358221220a16a68a0dee09aa0fe1a8182a69e1a73a6374f055ffc8f9e53f26dac11e33d6c64736f6c63430008150033" # noqa: E501
SIMPLE_CONSTRUCTOR_CONTRACT_RUNTIME = "0x60806040525f80fdfea2646970667358221220a16a68a0dee09aa0fe1a8182a69e1a73a6374f055ffc8f9e53f26dac11e33d6c64736f6c63430008150033" # noqa: E501
SIMPLE_CONSTRUCTOR_CONTRACT_BYTECODE = "0x6080604052348015600e575f80fd5b50603e80601a5f395ff3fe60806040525f80fdfea26469706673582212208838a724f0e996aa33232a758d031268d3220735db216f5855610fa6a91d2c8a64736f6c63430008160033" # noqa: E501
SIMPLE_CONSTRUCTOR_CONTRACT_RUNTIME = "0x60806040525f80fdfea26469706673582212208838a724f0e996aa33232a758d031268d3220735db216f5855610fa6a91d2c8a64736f6c63430008160033" # noqa: E501
SIMPLE_CONSTRUCTOR_CONTRACT_ABI = [
{"inputs": [], "stateMutability": "nonpayable", "type": "constructor"}
]
Expand All @@ -17,8 +17,8 @@


# source: web3/_utils/contract_sources/ConstructorContracts.sol:ConstructorWithArgumentsContract # noqa: E501
CONSTRUCTOR_WITH_ARGUMENTS_CONTRACT_BYTECODE = "0x608060405234801561000f575f80fd5b506040516101fd3803806101fd833981810160405281019061003191906100af565b815f819055508060018190555050506100ed565b5f80fd5b5f819050919050565b61005b81610049565b8114610065575f80fd5b50565b5f8151905061007681610052565b92915050565b5f819050919050565b61008e8161007c565b8114610098575f80fd5b50565b5f815190506100a981610085565b92915050565b5f80604083850312156100c5576100c4610045565b5b5f6100d285828601610068565b92505060206100e38582860161009b565b9150509250929050565b610103806100fa5f395ff3fe6080604052348015600e575f80fd5b50600436106030575f3560e01c806388ec1346146034578063d4c46c7614604e575b5f80fd5b603a6068565b604051604591906089565b60405180910390f35b6054606d565b604051605f919060b6565b60405180910390f35b5f5481565b60015481565b5f819050919050565b6083816073565b82525050565b5f602082019050609a5f830184607c565b92915050565b5f819050919050565b60b08160a0565b82525050565b5f60208201905060c75f83018460a9565b9291505056fea264697066735822122021da5c5002078b01bfc162eb4b14bd14740a8fbac8db497b36652a4535029e8164736f6c63430008150033" # noqa: E501
CONSTRUCTOR_WITH_ARGUMENTS_CONTRACT_RUNTIME = "0x6080604052348015600e575f80fd5b50600436106030575f3560e01c806388ec1346146034578063d4c46c7614604e575b5f80fd5b603a6068565b604051604591906089565b60405180910390f35b6054606d565b604051605f919060b6565b60405180910390f35b5f5481565b60015481565b5f819050919050565b6083816073565b82525050565b5f602082019050609a5f830184607c565b92915050565b5f819050919050565b60b08160a0565b82525050565b5f60208201905060c75f83018460a9565b9291505056fea264697066735822122021da5c5002078b01bfc162eb4b14bd14740a8fbac8db497b36652a4535029e8164736f6c63430008150033" # noqa: E501
CONSTRUCTOR_WITH_ARGUMENTS_CONTRACT_BYTECODE = "0x608060405234801561000f575f80fd5b506040516101fd3803806101fd833981810160405281019061003191906100af565b815f819055508060018190555050506100ed565b5f80fd5b5f819050919050565b61005b81610049565b8114610065575f80fd5b50565b5f8151905061007681610052565b92915050565b5f819050919050565b61008e8161007c565b8114610098575f80fd5b50565b5f815190506100a981610085565b92915050565b5f80604083850312156100c5576100c4610045565b5b5f6100d285828601610068565b92505060206100e38582860161009b565b9150509250929050565b610103806100fa5f395ff3fe6080604052348015600e575f80fd5b50600436106030575f3560e01c806388ec1346146034578063d4c46c7614604e575b5f80fd5b603a6068565b604051604591906089565b60405180910390f35b6054606d565b604051605f919060b6565b60405180910390f35b5f5481565b60015481565b5f819050919050565b6083816073565b82525050565b5f602082019050609a5f830184607c565b92915050565b5f819050919050565b60b08160a0565b82525050565b5f60208201905060c75f83018460a9565b9291505056fea2646970667358221220b011a3672d395bd4f0d8411227f6f6599aa327921f7659c3c31b183d7d6d53c364736f6c63430008160033" # noqa: E501
CONSTRUCTOR_WITH_ARGUMENTS_CONTRACT_RUNTIME = "0x6080604052348015600e575f80fd5b50600436106030575f3560e01c806388ec1346146034578063d4c46c7614604e575b5f80fd5b603a6068565b604051604591906089565b60405180910390f35b6054606d565b604051605f919060b6565b60405180910390f35b5f5481565b60015481565b5f819050919050565b6083816073565b82525050565b5f602082019050609a5f830184607c565b92915050565b5f819050919050565b60b08160a0565b82525050565b5f60208201905060c75f83018460a9565b9291505056fea2646970667358221220b011a3672d395bd4f0d8411227f6f6599aa327921f7659c3c31b183d7d6d53c364736f6c63430008160033" # noqa: E501
CONSTRUCTOR_WITH_ARGUMENTS_CONTRACT_ABI = [
{
"inputs": [
Expand Down Expand Up @@ -51,8 +51,8 @@


# source: web3/_utils/contract_sources/ConstructorContracts.sol:ConstructorWithAddressArgumentContract # noqa: E501
CONSTRUCTOR_WITH_ADDRESS_ARGUMENT_CONTRACT_BYTECODE = "0x608060405234801561000f575f80fd5b506040516101fa3803806101fa833981810160405281019061003191906100d4565b805f806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550506100ff565b5f80fd5b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b5f6100a38261007a565b9050919050565b6100b381610099565b81146100bd575f80fd5b50565b5f815190506100ce816100aa565b92915050565b5f602082840312156100e9576100e8610076565b5b5f6100f6848285016100c0565b91505092915050565b60ef8061010b5f395ff3fe6080604052348015600e575f80fd5b50600436106026575f3560e01c806334664e3a14602a575b5f80fd5b60306044565b604051603b919060a2565b60405180910390f35b5f8054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b5f608e826067565b9050919050565b609c816086565b82525050565b5f60208201905060b35f8301846095565b9291505056fea2646970667358221220a1c3d52baa9c1ada98496768785af2d7373524faf9996b177485274fde2ac80a64736f6c63430008150033" # noqa: E501
CONSTRUCTOR_WITH_ADDRESS_ARGUMENT_CONTRACT_RUNTIME = "0x6080604052348015600e575f80fd5b50600436106026575f3560e01c806334664e3a14602a575b5f80fd5b60306044565b604051603b919060a2565b60405180910390f35b5f8054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b5f608e826067565b9050919050565b609c816086565b82525050565b5f60208201905060b35f8301846095565b9291505056fea2646970667358221220a1c3d52baa9c1ada98496768785af2d7373524faf9996b177485274fde2ac80a64736f6c63430008150033" # noqa: E501
CONSTRUCTOR_WITH_ADDRESS_ARGUMENT_CONTRACT_BYTECODE = "0x608060405234801561000f575f80fd5b506040516101fa3803806101fa833981810160405281019061003191906100d4565b805f806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550506100ff565b5f80fd5b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b5f6100a38261007a565b9050919050565b6100b381610099565b81146100bd575f80fd5b50565b5f815190506100ce816100aa565b92915050565b5f602082840312156100e9576100e8610076565b5b5f6100f6848285016100c0565b91505092915050565b60ef8061010b5f395ff3fe6080604052348015600e575f80fd5b50600436106026575f3560e01c806334664e3a14602a575b5f80fd5b60306044565b604051603b919060a2565b60405180910390f35b5f8054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b5f608e826067565b9050919050565b609c816086565b82525050565b5f60208201905060b35f8301846095565b9291505056fea2646970667358221220ecd33f4cb24248b78326c9c128572fdd121737421f1ac12fd3003abd476b22f764736f6c63430008160033" # noqa: E501
CONSTRUCTOR_WITH_ADDRESS_ARGUMENT_CONTRACT_RUNTIME = "0x6080604052348015600e575f80fd5b50600436106026575f3560e01c806334664e3a14602a575b5f80fd5b60306044565b604051603b919060a2565b60405180910390f35b5f8054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b5f608e826067565b9050919050565b609c816086565b82525050565b5f60208201905060b35f8301846095565b9291505056fea2646970667358221220ecd33f4cb24248b78326c9c128572fdd121737421f1ac12fd3003abd476b22f764736f6c63430008160033" # noqa: E501
CONSTRUCTOR_WITH_ADDRESS_ARGUMENT_CONTRACT_ABI = [
{
"inputs": [{"internalType": "address", "name": "_testAddr", "type": "address"}],
Expand Down
6 changes: 3 additions & 3 deletions web3/_utils/contract_sources/contract_data/contract_caller_tester.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
"""
Generated by `compile_contracts.py` script.
Compiled with Solidity v0.8.21.
Compiled with Solidity v0.8.22.
"""

# source: web3/_utils/contract_sources/ContractCallerTester.sol:ContractCallerTester
CONTRACT_CALLER_TESTER_BYTECODE = "0x608060405234801561000f575f80fd5b506104328061001d5f395ff3fe608060405260043610610049575f3560e01c806306661abd1461004d57806361bc221a14610077578063a5f3c23b14610095578063c7fa7d66146100c5578063d09de08a146100e7575b5f80fd5b348015610058575f80fd5b50610061610111565b60405161006e91906101d0565b60405180910390f35b61007f610116565b60405161008c91906101d0565b60405180910390f35b6100af60048036038101906100aa9190610217565b61011e565b6040516100bc91906101d0565b60405180910390f35b6100cd610133565b6040516100de959493929190610336565b60405180910390f35b3480156100f2575f80fd5b506100fb61019b565b60405161010891906101d0565b60405180910390f35b5f5481565b5f8054905090565b5f818361012b91906103bb565b905092915050565b5f60605f805f335f365a344384848080601f0160208091040260200160405190810160405280939291908181526020018383808284375f81840152601f19601f8201169050808301925050505050505093509091929350945094509450945094509091929394565b5f60015f808282546101ad91906103bb565b925050819055905090565b5f819050919050565b6101ca816101b8565b82525050565b5f6020820190506101e35f8301846101c1565b92915050565b5f80fd5b6101f6816101b8565b8114610200575f80fd5b50565b5f81359050610211816101ed565b92915050565b5f806040838503121561022d5761022c6101e9565b5b5f61023a85828601610203565b925050602061024b85828601610203565b9150509250929050565b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b5f61027e82610255565b9050919050565b61028e81610274565b82525050565b5f81519050919050565b5f82825260208201905092915050565b5f5b838110156102cb5780820151818401526020810190506102b0565b5f8484015250505050565b5f601f19601f8301169050919050565b5f6102f082610294565b6102fa818561029e565b935061030a8185602086016102ae565b610313816102d6565b840191505092915050565b5f819050919050565b6103308161031e565b82525050565b5f60a0820190506103495f830188610285565b818103602083015261035b81876102e6565b905061036a6040830186610327565b6103776060830185610327565b6103846080830184610327565b9695505050505050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52601160045260245ffd5b5f6103c5826101b8565b91506103d0836101b8565b92508282019050828112155f8312168382125f8412151617156103f6576103f561038e565b5b9291505056fea26469706673582212207f712adfd857b2ab7de94a7ff65b1f78b15424307f7c5dacae2c3f396c5f25b764736f6c63430008150033" # noqa: E501
CONTRACT_CALLER_TESTER_RUNTIME = "0x608060405260043610610049575f3560e01c806306661abd1461004d57806361bc221a14610077578063a5f3c23b14610095578063c7fa7d66146100c5578063d09de08a146100e7575b5f80fd5b348015610058575f80fd5b50610061610111565b60405161006e91906101d0565b60405180910390f35b61007f610116565b60405161008c91906101d0565b60405180910390f35b6100af60048036038101906100aa9190610217565b61011e565b6040516100bc91906101d0565b60405180910390f35b6100cd610133565b6040516100de959493929190610336565b60405180910390f35b3480156100f2575f80fd5b506100fb61019b565b60405161010891906101d0565b60405180910390f35b5f5481565b5f8054905090565b5f818361012b91906103bb565b905092915050565b5f60605f805f335f365a344384848080601f0160208091040260200160405190810160405280939291908181526020018383808284375f81840152601f19601f8201169050808301925050505050505093509091929350945094509450945094509091929394565b5f60015f808282546101ad91906103bb565b925050819055905090565b5f819050919050565b6101ca816101b8565b82525050565b5f6020820190506101e35f8301846101c1565b92915050565b5f80fd5b6101f6816101b8565b8114610200575f80fd5b50565b5f81359050610211816101ed565b92915050565b5f806040838503121561022d5761022c6101e9565b5b5f61023a85828601610203565b925050602061024b85828601610203565b9150509250929050565b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b5f61027e82610255565b9050919050565b61028e81610274565b82525050565b5f81519050919050565b5f82825260208201905092915050565b5f5b838110156102cb5780820151818401526020810190506102b0565b5f8484015250505050565b5f601f19601f8301169050919050565b5f6102f082610294565b6102fa818561029e565b935061030a8185602086016102ae565b610313816102d6565b840191505092915050565b5f819050919050565b6103308161031e565b82525050565b5f60a0820190506103495f830188610285565b818103602083015261035b81876102e6565b905061036a6040830186610327565b6103776060830185610327565b6103846080830184610327565b9695505050505050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52601160045260245ffd5b5f6103c5826101b8565b91506103d0836101b8565b92508282019050828112155f8312168382125f8412151617156103f6576103f561038e565b5b9291505056fea26469706673582212207f712adfd857b2ab7de94a7ff65b1f78b15424307f7c5dacae2c3f396c5f25b764736f6c63430008150033" # noqa: E501
CONTRACT_CALLER_TESTER_BYTECODE = "0x608060405234801561000f575f80fd5b506104328061001d5f395ff3fe608060405260043610610049575f3560e01c806306661abd1461004d57806361bc221a14610077578063a5f3c23b14610095578063c7fa7d66146100c5578063d09de08a146100e7575b5f80fd5b348015610058575f80fd5b50610061610111565b60405161006e91906101d0565b60405180910390f35b61007f610116565b60405161008c91906101d0565b60405180910390f35b6100af60048036038101906100aa9190610217565b61011e565b6040516100bc91906101d0565b60405180910390f35b6100cd610133565b6040516100de959493929190610336565b60405180910390f35b3480156100f2575f80fd5b506100fb61019b565b60405161010891906101d0565b60405180910390f35b5f5481565b5f8054905090565b5f818361012b91906103bb565b905092915050565b5f60605f805f335f365a344384848080601f0160208091040260200160405190810160405280939291908181526020018383808284375f81840152601f19601f8201169050808301925050505050505093509091929350945094509450945094509091929394565b5f60015f808282546101ad91906103bb565b925050819055905090565b5f819050919050565b6101ca816101b8565b82525050565b5f6020820190506101e35f8301846101c1565b92915050565b5f80fd5b6101f6816101b8565b8114610200575f80fd5b50565b5f81359050610211816101ed565b92915050565b5f806040838503121561022d5761022c6101e9565b5b5f61023a85828601610203565b925050602061024b85828601610203565b9150509250929050565b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b5f61027e82610255565b9050919050565b61028e81610274565b82525050565b5f81519050919050565b5f82825260208201905092915050565b5f5b838110156102cb5780820151818401526020810190506102b0565b5f8484015250505050565b5f601f19601f8301169050919050565b5f6102f082610294565b6102fa818561029e565b935061030a8185602086016102ae565b610313816102d6565b840191505092915050565b5f819050919050565b6103308161031e565b82525050565b5f60a0820190506103495f830188610285565b818103602083015261035b81876102e6565b905061036a6040830186610327565b6103776060830185610327565b6103846080830184610327565b9695505050505050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52601160045260245ffd5b5f6103c5826101b8565b91506103d0836101b8565b92508282019050828112155f8312168382125f8412151617156103f6576103f561038e565b5b9291505056fea2646970667358221220bc4b45217d1d029188c1338430b32a06a455405017f3bc623676e519cae4c81a64736f6c63430008160033" # noqa: E501
CONTRACT_CALLER_TESTER_RUNTIME = "0x608060405260043610610049575f3560e01c806306661abd1461004d57806361bc221a14610077578063a5f3c23b14610095578063c7fa7d66146100c5578063d09de08a146100e7575b5f80fd5b348015610058575f80fd5b50610061610111565b60405161006e91906101d0565b60405180910390f35b61007f610116565b60405161008c91906101d0565b60405180910390f35b6100af60048036038101906100aa9190610217565b61011e565b6040516100bc91906101d0565b60405180910390f35b6100cd610133565b6040516100de959493929190610336565b60405180910390f35b3480156100f2575f80fd5b506100fb61019b565b60405161010891906101d0565b60405180910390f35b5f5481565b5f8054905090565b5f818361012b91906103bb565b905092915050565b5f60605f805f335f365a344384848080601f0160208091040260200160405190810160405280939291908181526020018383808284375f81840152601f19601f8201169050808301925050505050505093509091929350945094509450945094509091929394565b5f60015f808282546101ad91906103bb565b925050819055905090565b5f819050919050565b6101ca816101b8565b82525050565b5f6020820190506101e35f8301846101c1565b92915050565b5f80fd5b6101f6816101b8565b8114610200575f80fd5b50565b5f81359050610211816101ed565b92915050565b5f806040838503121561022d5761022c6101e9565b5b5f61023a85828601610203565b925050602061024b85828601610203565b9150509250929050565b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b5f61027e82610255565b9050919050565b61028e81610274565b82525050565b5f81519050919050565b5f82825260208201905092915050565b5f5b838110156102cb5780820151818401526020810190506102b0565b5f8484015250505050565b5f601f19601f8301169050919050565b5f6102f082610294565b6102fa818561029e565b935061030a8185602086016102ae565b610313816102d6565b840191505092915050565b5f819050919050565b6103308161031e565b82525050565b5f60a0820190506103495f830188610285565b818103602083015261035b81876102e6565b905061036a6040830186610327565b6103776060830185610327565b6103846080830184610327565b9695505050505050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52601160045260245ffd5b5f6103c5826101b8565b91506103d0836101b8565b92508282019050828112155f8312168382125f8412151617156103f6576103f561038e565b5b9291505056fea2646970667358221220bc4b45217d1d029188c1338430b32a06a455405017f3bc623676e519cae4c81a64736f6c63430008160033" # noqa: E501
CONTRACT_CALLER_TESTER_ABI = [
{
"inputs": [
Expand Down