From 744d677b3c19c4decaa43763609c5b35004438ac Mon Sep 17 00:00:00 2001 From: mmsqe Date: Mon, 10 Jun 2024 18:02:03 +0800 Subject: [PATCH 1/3] Problem: rustc in nixpkgs is too old --- integration_tests/configs/ibc.jsonnet | 6 -- integration_tests/configs/ibc_rly.jsonnet | 3 - integration_tests/cosmoscli.py | 10 +++- integration_tests/poetry.lock | 69 ++++------------------- integration_tests/pyproject.toml | 1 + nix/default.nix | 2 +- nix/sources.json | 24 ++++---- 7 files changed, 34 insertions(+), 81 deletions(-) diff --git a/integration_tests/configs/ibc.jsonnet b/integration_tests/configs/ibc.jsonnet index 2f672f850f..b22730877f 100644 --- a/integration_tests/configs/ibc.jsonnet +++ b/integration_tests/configs/ibc.jsonnet @@ -51,18 +51,12 @@ config { coins: '2234240000000000000cro', staked: '10000000000000cro', mnemonic: '${VALIDATOR1_MNEMONIC}', - client_config: { - 'broadcast-mode': 'block', - }, base_port: 26800, }, { coins: '987870000000000000cro', staked: '20000000000000cro', mnemonic: '${VALIDATOR2_MNEMONIC}', - client_config: { - 'broadcast-mode': 'block', - }, base_port: 26810, }, ], diff --git a/integration_tests/configs/ibc_rly.jsonnet b/integration_tests/configs/ibc_rly.jsonnet index 92a3d4c902..270aa7cb5c 100644 --- a/integration_tests/configs/ibc_rly.jsonnet +++ b/integration_tests/configs/ibc_rly.jsonnet @@ -7,9 +7,6 @@ ibc { coins: '987870000000000000cro', staked: '20000000000000cro', mnemonic: '${VALIDATOR' + i + '_MNEMONIC}', - client_config: { - 'broadcast-mode': 'block', - }, base_port: 26800 + i * 10, } for i in std.range(1, 2) diff --git a/integration_tests/cosmoscli.py b/integration_tests/cosmoscli.py index e1618f130d..a34cb9df7f 100644 --- a/integration_tests/cosmoscli.py +++ b/integration_tests/cosmoscli.py @@ -344,7 +344,7 @@ def staking_pool(self, bonded=True): def transfer(self, from_, to, coins, generate_only=False, fees=None, **kwargs): kwargs.setdefault("gas_prices", DEFAULT_GAS_PRICE) - return json.loads( + rsp = json.loads( self.raw( "tx", "bank", @@ -359,6 +359,9 @@ def transfer(self, from_, to, coins, generate_only=False, fees=None, **kwargs): **kwargs, ) ) + if rsp["code"] == 0: + rsp = self.event_query_tx_for(rsp["txhash"]) + return rsp def get_delegated_amount(self, which_addr): return json.loads( @@ -1555,7 +1558,7 @@ def register_counterparty_payee( default_kwargs = { "home": self.data_dir, } - return json.loads( + rsp = json.loads( self.raw( "tx", "ibc-fee", @@ -1568,6 +1571,9 @@ def register_counterparty_payee( **(default_kwargs | kwargs), ) ) + if rsp["code"] == 0: + rsp = self.event_query_tx_for(rsp["txhash"]) + return rsp def register_payee(self, port_id, channel_id, relayer, payee, **kwargs): default_kwargs = { diff --git a/integration_tests/poetry.lock b/integration_tests/poetry.lock index 632b48ecf9..3958e66b93 100644 --- a/integration_tests/poetry.lock +++ b/integration_tests/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. [[package]] name = "aiohttp" @@ -1622,64 +1622,19 @@ files = [ ] [[package]] -name = "pyyaml" -version = "6.0.1" +name = "PyYAML" +version = "6.0" description = "YAML parser and emitter for Python" optional = false python-versions = ">=3.6" -files = [ - {file = "PyYAML-6.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d858aa552c999bc8a8d57426ed01e40bef403cd8ccdd0fc5f6f04a00414cac2a"}, - {file = "PyYAML-6.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f"}, - {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"}, - {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"}, - {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"}, - {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"}, - {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"}, - {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"}, - {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"}, - {file = "PyYAML-6.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f003ed9ad21d6a4713f0a9b5a7a0a79e08dd0f221aff4525a2be4c346ee60aab"}, - {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"}, - {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"}, - {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"}, - {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"}, - {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"}, - {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, - {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, - {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, - {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"}, - {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, - {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, - {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, - {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"}, - {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"}, - {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"}, - {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"}, - {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:afd7e57eddb1a54f0f1a974bc4391af8bcce0b444685d936840f125cf046d5bd"}, - {file = "PyYAML-6.0.1-cp36-cp36m-win32.whl", hash = "sha256:fca0e3a251908a499833aa292323f32437106001d436eca0e6e7833256674585"}, - {file = "PyYAML-6.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:f22ac1c3cac4dbc50079e965eba2c1058622631e526bd9afd45fedd49ba781fa"}, - {file = "PyYAML-6.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:b1275ad35a5d18c62a7220633c913e1b42d44b46ee12554e5fd39c70a243d6a3"}, - {file = "PyYAML-6.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:18aeb1bf9a78867dc38b259769503436b7c72f7a1f1f4c93ff9a17de54319b27"}, - {file = "PyYAML-6.0.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:596106435fa6ad000c2991a98fa58eeb8656ef2325d7e158344fb33864ed87e3"}, - {file = "PyYAML-6.0.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:baa90d3f661d43131ca170712d903e6295d1f7a0f595074f151c0aed377c9b9c"}, - {file = "PyYAML-6.0.1-cp37-cp37m-win32.whl", hash = "sha256:9046c58c4395dff28dd494285c82ba00b546adfc7ef001486fbf0324bc174fba"}, - {file = "PyYAML-6.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:4fb147e7a67ef577a588a0e2c17b6db51dda102c71de36f8549b6816a96e1867"}, - {file = "PyYAML-6.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1d4c7e777c441b20e32f52bd377e0c409713e8bb1386e1099c2415f26e479595"}, - {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"}, - {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"}, - {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"}, - {file = "PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6"}, - {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"}, - {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"}, - {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"}, - {file = "PyYAML-6.0.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c8098ddcc2a85b61647b2590f825f3db38891662cfc2fc776415143f599bb859"}, - {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"}, - {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"}, - {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"}, - {file = "PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5"}, - {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"}, - {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"}, - {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"}, -] +files = [] +develop = false + +[package.source] +type = "git" +url = "https://github.com/nitzmahone/pyyaml.git" +reference = "cython3test" +resolved_reference = "3237b4074243704a9cce41dbf6dc14a2a2d4d78e" [[package]] name = "pyyaml-include" @@ -2316,4 +2271,4 @@ multidict = ">=4.0" [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "d2485b6c186fd7e9f640c53ddd0faacd456329791762696ca7161fc187621679" +content-hash = "dbf08c90b242d86402081695380af533fb4afc14ae1742e80ea25529dc2a2159" diff --git a/integration_tests/pyproject.toml b/integration_tests/pyproject.toml index 87d9ee8859..cffd2dc628 100644 --- a/integration_tests/pyproject.toml +++ b/integration_tests/pyproject.toml @@ -26,6 +26,7 @@ cprotobuf = "^0.1.11" flaky = "^3.7" eth-bloom = "^3.0" eth-hash = "^0" +pyyaml = { git = "https://github.com/nitzmahone/pyyaml.git", branch = "cython3test" } [tool.poetry.dev-dependencies] diff --git a/nix/default.nix b/nix/default.nix index f061a10e59..1f9ffa4451 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -8,7 +8,7 @@ import sources.nixpkgs { go-ethereum = pkgs.callPackage ./go-ethereum.nix { inherit (pkgs.darwin) libobjc; inherit (pkgs.darwin.apple_sdk.frameworks) IOKit; - buildGoModule = pkgs.buildGo120Module; + buildGoModule = pkgs.buildGo121Module; }; flake-compat = import sources.flake-compat; chain-maind = pkgs.callPackage sources.chain-main { rocksdb = null; }; diff --git a/nix/sources.json b/nix/sources.json index a0613ffbee..59e87d69c2 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -5,10 +5,10 @@ "homepage": "https://crypto.org", "owner": "crypto-org-chain", "repo": "chain-main", - "rev": "04e8e094b7d51a8cf92b74c789394b7b34987b10", - "sha256": "1yqd2i8dwphjhdsvl3v7l8gvrjjl6i6pj4nq58lwcf3s6nhwy6d5", + "rev": "76ae54b533c0c419799d23508dc4362f5ea26d22", + "sha256": "0jdmxiv3zhkapr51hl9fqqw0qwsz0632ydhk2cyfamknjny81kk9", "type": "tarball", - "url": "https://github.com/crypto-org-chain/chain-main/archive/04e8e094b7d51a8cf92b74c789394b7b34987b10.tar.gz", + "url": "https://github.com/crypto-org-chain/chain-main/archive/76ae54b533c0c419799d23508dc4362f5ea26d22.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "dapptools": { @@ -54,10 +54,10 @@ "homepage": null, "owner": "nix-community", "repo": "gomod2nix", - "rev": "30e3c3a9ec4ac8453282ca7f67fca9e1da12c3e6", - "sha256": "1m0q0p1xidsp61xfrbj8ld1dqk3fhyrfifxj2ks36yjbnzmi1x69", + "rev": "31b6d2e40b36456e792cd6cf50d5a8ddd2fa59a1", + "sha256": "0b8cmc8dk34pgcac5s1jvryfcn8kyhbzhh1i22rzv5kf00f09lhb", "type": "tarball", - "url": "https://github.com/nix-community/gomod2nix/archive/30e3c3a9ec4ac8453282ca7f67fca9e1da12c3e6.tar.gz", + "url": "https://github.com/nix-community/gomod2nix/archive/31b6d2e40b36456e792cd6cf50d5a8ddd2fa59a1.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "gravity-bridge": { @@ -78,10 +78,10 @@ "homepage": "", "owner": "informalsystems", "repo": "ibc-rs", - "rev": "1d2aa0c7108dc278e00731cc91bc366a418e2543", - "sha256": "08i1w1lcdwlpa70vzw305g0hh23q0mkby8fvf693zxq430y55gjs", + "rev": "a026d661a74b93ffdefdc9f431007b1a6b4e95d0", + "sha256": "134h0s80laifd0ln1lx9ljcmq8pxpi5s7xmf1q5bz1mrrwmpmk9q", "type": "tarball", - "url": "https://github.com/informalsystems/hermes/archive/1d2aa0c7108dc278e00731cc91bc366a418e2543.tar.gz", + "url": "https://github.com/informalsystems/hermes/archive/a026d661a74b93ffdefdc9f431007b1a6b4e95d0.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "niv": { @@ -102,10 +102,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "86ef6bd96b6279e1a4a53236d341f5df1ede3803", - "sha256": "0mmgk3bg8rqs4mlsaxr5hyvzqn3sg53pqqm1aiwq00kmcnhds7nx", + "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", + "sha256": "1lr1h35prqkd1mkmzriwlpvxcb34kmhc9dnr48gkm8hh089hifmx", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/86ef6bd96b6279e1a4a53236d341f5df1ede3803.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/63dacb46bf939521bdc93981b4cbb7ecb58427a0.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "poetry2nix": { From 576d9ced3034ece01e5028a004301eb83fc370c8 Mon Sep 17 00:00:00 2001 From: mmsqe Date: Tue, 11 Jun 2024 12:41:04 +0800 Subject: [PATCH 2/3] point to main --- integration_tests/poetry.lock | 12 ++++++------ integration_tests/pyproject.toml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/integration_tests/poetry.lock b/integration_tests/poetry.lock index 3958e66b93..ad0a3be8b2 100644 --- a/integration_tests/poetry.lock +++ b/integration_tests/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. [[package]] name = "aiohttp" @@ -1623,7 +1623,7 @@ files = [ [[package]] name = "PyYAML" -version = "6.0" +version = "6.0.1" description = "YAML parser and emitter for Python" optional = false python-versions = ">=3.6" @@ -1632,9 +1632,9 @@ develop = false [package.source] type = "git" -url = "https://github.com/nitzmahone/pyyaml.git" -reference = "cython3test" -resolved_reference = "3237b4074243704a9cce41dbf6dc14a2a2d4d78e" +url = "https://github.com/yaml/pyyaml.git" +reference = "main" +resolved_reference = "a2d19c0234866dc9d4d55abf3009699c258bb72f" [[package]] name = "pyyaml-include" @@ -2271,4 +2271,4 @@ multidict = ">=4.0" [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "dbf08c90b242d86402081695380af533fb4afc14ae1742e80ea25529dc2a2159" +content-hash = "118bf8d4cb6d1ae95ee35c0b75060f3b1b2e9ed44521fc994c1a56ca1bc21b37" diff --git a/integration_tests/pyproject.toml b/integration_tests/pyproject.toml index cffd2dc628..dc74bfc1f6 100644 --- a/integration_tests/pyproject.toml +++ b/integration_tests/pyproject.toml @@ -26,7 +26,7 @@ cprotobuf = "^0.1.11" flaky = "^3.7" eth-bloom = "^3.0" eth-hash = "^0" -pyyaml = { git = "https://github.com/nitzmahone/pyyaml.git", branch = "cython3test" } +pyyaml = { git = "https://github.com/yaml/pyyaml.git", branch = "main" } [tool.poetry.dev-dependencies] From f447c0e8fb6f1d74202478acd4b60f552a357d90 Mon Sep 17 00:00:00 2001 From: huangyi Date: Tue, 11 Jun 2024 13:15:42 +0800 Subject: [PATCH 3/3] update pyyaml --- integration_tests/poetry.lock | 71 ++++++++++++++++++++++++++------ integration_tests/pyproject.toml | 2 +- 2 files changed, 60 insertions(+), 13 deletions(-) diff --git a/integration_tests/poetry.lock b/integration_tests/poetry.lock index ad0a3be8b2..42a6580020 100644 --- a/integration_tests/poetry.lock +++ b/integration_tests/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. [[package]] name = "aiohttp" @@ -1622,19 +1622,66 @@ files = [ ] [[package]] -name = "PyYAML" -version = "6.0.1" +name = "pyyaml" +version = "6.0.2rc1" description = "YAML parser and emitter for Python" optional = false python-versions = ">=3.6" -files = [] -develop = false - -[package.source] -type = "git" -url = "https://github.com/yaml/pyyaml.git" -reference = "main" -resolved_reference = "a2d19c0234866dc9d4d55abf3009699c258bb72f" +files = [ + {file = "PyYAML-6.0.2rc1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:414629800a1ddccd7303471650843fc801801cc579a195d2fe617b5b455409e3"}, + {file = "PyYAML-6.0.2rc1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d6e0f7ee5f8d851b1d91149a3e5074dbf5aacbb63e4b771fcce16508339a856f"}, + {file = "PyYAML-6.0.2rc1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bc3c3600fec6c2a719106381d6282061d8c108369cdec58b6f280610eba41e09"}, + {file = "PyYAML-6.0.2rc1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8e0a1ebd5c5842595365bf90db3ef7e9a8d6a79c9aedb1d05b675c81c7267fd3"}, + {file = "PyYAML-6.0.2rc1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b1de10c488d6f02e498eb6956b89081bea31abf3133223c17749e7137734da75"}, + {file = "PyYAML-6.0.2rc1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:bae077a01367e4bf5fddf00fd6c8b743e676385911c7c615e29e1c45ace8813b"}, + {file = "PyYAML-6.0.2rc1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:7ee3d180d886a3bc50f753b76340f1c314f9e8c507f5b107212112214c3a66fd"}, + {file = "PyYAML-6.0.2rc1-cp310-cp310-win32.whl", hash = "sha256:29b4a67915232f79506211e69943e3102e211c616181ceff0adf34e21b469357"}, + {file = "PyYAML-6.0.2rc1-cp310-cp310-win_amd64.whl", hash = "sha256:e7930a0612e74fcca37019ca851b50d73b5f0c3dab7f3085a7c15d2026118315"}, + {file = "PyYAML-6.0.2rc1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:ad206c7f5f08d393b872d3399f597246fdc6ebebff09c5ae5268ac45aebf4f8d"}, + {file = "PyYAML-6.0.2rc1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:58cc18ccbade0c48fb55102aa971a5b4e571e2b22187d083dda33f8708fa4ee7"}, + {file = "PyYAML-6.0.2rc1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:30ec6b9afc17353a9abcff109880edf6e8d5b924eb1eeed7fe9376febc1f9800"}, + {file = "PyYAML-6.0.2rc1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:88bfe675bb19ae12a9c77c52322a28a8e2a8d3d213fbcfcded5c3f5ca3ead352"}, + {file = "PyYAML-6.0.2rc1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:54c754cee6937bb9b72d6a16163160dec80b93a43020ac6fc9f13729c030c30b"}, + {file = "PyYAML-6.0.2rc1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:0ae563b7e3ed5e918cd0184060e28b48b7e672b975bf7c6f4a892cee9d886ada"}, + {file = "PyYAML-6.0.2rc1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:53056b51f111223e603bed1db5367f54596d44cacfa50f07e082a11929612957"}, + {file = "PyYAML-6.0.2rc1-cp311-cp311-win32.whl", hash = "sha256:eee36bf4bc11e39e3f17c171f25cdedff3d7c73b148aedc8820257ce2aa56d3b"}, + {file = "PyYAML-6.0.2rc1-cp311-cp311-win_amd64.whl", hash = "sha256:b408f36eeb4e2be6f802f1be82daf1b578f3de5a51917c6e467aedb46187d827"}, + {file = "PyYAML-6.0.2rc1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:72ffbc5c0cc71877104387548a450f2b7b7c4926b40dc9443e7598fe92aa13d9"}, + {file = "PyYAML-6.0.2rc1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ad0c172fe15beffc32e3a8260f18e6708eb0e15ae82c9b3f80fbe04de0ef5729"}, + {file = "PyYAML-6.0.2rc1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:73d8b233309ecd45c33c51cd55aa1be1dcab1799a9e54f6c753d8cab054b8c34"}, + {file = "PyYAML-6.0.2rc1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0fe2c1c5401a3a98f06337fed48f57340cf652a685484834b44f5ceeadb772ba"}, + {file = "PyYAML-6.0.2rc1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:765029d1cf96e9e761329ee1c20f1ca2de8644e7350a151b198260698b96e30f"}, + {file = "PyYAML-6.0.2rc1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:459113f2b9cd68881201a3bd1a858ece3281dc0e92ece6e917d23b128f0fcb31"}, + {file = "PyYAML-6.0.2rc1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:2e9bc8a34797f0621f56160b961d47a088644370f79d34bedc934fb89e3f47dd"}, + {file = "PyYAML-6.0.2rc1-cp312-cp312-win32.whl", hash = "sha256:9c5c0de7ec50d4df88b62f4b019ab7b3bb2883c826a1044268e9afb344c57b17"}, + {file = "PyYAML-6.0.2rc1-cp312-cp312-win_amd64.whl", hash = "sha256:46e4fae38d00b40a62d32d60f1baa1b9ef33aff28c2aafd96b05d5cc770f1583"}, + {file = "PyYAML-6.0.2rc1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:84c39ceec517cd8f01cb144efb08904a32050be51c55b7a59bc7958c8091568d"}, + {file = "PyYAML-6.0.2rc1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:60bf91e73354c96754220a9c04a9502c2ad063231cd754b59f8e4511157e32e2"}, + {file = "PyYAML-6.0.2rc1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:36d7bf63558843ea2a81de9d0c3e9c56c353b1df8e6c1faaec86df5adedf2e02"}, + {file = "PyYAML-6.0.2rc1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6f0f728a88c6eb58a3b762726b965bb6acf12d97f8ea2cb4fecf856a727f9bdc"}, + {file = "PyYAML-6.0.2rc1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:728b447d0cedec409ea1a3f0ad1a6cc3cec0a8d086611b45f038a9230a2242f3"}, + {file = "PyYAML-6.0.2rc1-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:1eb00dd3344da80264261ab126c95481824669ed9e5ecc82fb2d88b1fce668ee"}, + {file = "PyYAML-6.0.2rc1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:2086b30215c433c1e480c08c1db8b43c1edd36c59cf43d36b424e6f35fcaf1ad"}, + {file = "PyYAML-6.0.2rc1-cp313-cp313-win32.whl", hash = "sha256:50bd6560a6df3de59336b9a9086cbdea5aa9eee5361661448ee45c21eeb0da68"}, + {file = "PyYAML-6.0.2rc1-cp313-cp313-win_amd64.whl", hash = "sha256:4bf821ccd51e8d5bc1a4021b8bd85a92b498832ac1cd1a53b399f0eb7c1c4258"}, + {file = "PyYAML-6.0.2rc1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:31573d7e161d2f905311f036b12e65c058389b474dbd35740f4880b91e2ca2be"}, + {file = "PyYAML-6.0.2rc1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0101357af42f5c9fc7e9acc5c5ab8c3049f50db7425de175b6c7a5959cb6023d"}, + {file = "PyYAML-6.0.2rc1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f09816c047fdb588dddba53d321f1cb8081e38ad2a40ea6a7560a88b7a2f0ea8"}, + {file = "PyYAML-6.0.2rc1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b0dd9c7497d60126445e79e542ff01351c6b6dc121299d89787f5685b382c626"}, + {file = "PyYAML-6.0.2rc1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6f31c5935310da69ea0efe996a962d488f080312f0eb43beff1717acb5fe9bed"}, + {file = "PyYAML-6.0.2rc1-cp38-cp38-win32.whl", hash = "sha256:f07adc282d51aaa528f3141ac1922d16d32fe89413ee59bfb8a73ed689ad3d23"}, + {file = "PyYAML-6.0.2rc1-cp38-cp38-win_amd64.whl", hash = "sha256:53c5f0749a93e3296078262c9acf632de246241ff2f22bbedfe49d4b55e9bbdd"}, + {file = "PyYAML-6.0.2rc1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:fea4c4310061cd70ef73b39801231b9dc3dc638bb8858e38364b144fbd335a1a"}, + {file = "PyYAML-6.0.2rc1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:5921fd128fbf27ab7c7ad1a566d2cd9557b84ade130743a7c110a55e7dec3b3c"}, + {file = "PyYAML-6.0.2rc1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9426067a10b369474396bf57fdf895b899045a25d1848798844693780b147436"}, + {file = "PyYAML-6.0.2rc1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b0a163f4f84d1e0fe6a07ccad3b02e9b243790b8370ff0408ae5932c50c4d96d"}, + {file = "PyYAML-6.0.2rc1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ca5136a77e2d64b4cf5106fb940376650ae232c74c09a8ff29dbb1e262495b31"}, + {file = "PyYAML-6.0.2rc1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:e8e6dd230a158a836cda3cc521fcbedea16f22b16b8cfa8054d0c6cea5d0a531"}, + {file = "PyYAML-6.0.2rc1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:c16522bf91daa4ea9dedc1243b56b5a226357ab98b3133089ca627ef99baae6f"}, + {file = "PyYAML-6.0.2rc1-cp39-cp39-win32.whl", hash = "sha256:3af6b36bc195d741cd5b511810246cad143b99c953b4591e679e194a820d7b7c"}, + {file = "PyYAML-6.0.2rc1-cp39-cp39-win_amd64.whl", hash = "sha256:5c758cc29713c9166750a30156ca3d90ac2515d5dea3c874377ae8829cf03087"}, + {file = "pyyaml-6.0.2rc1.tar.gz", hash = "sha256:826fb4d5ac2c48b9d6e71423def2669d4646c93b6c13612a71b3ac7bb345304b"}, +] [[package]] name = "pyyaml-include" @@ -2271,4 +2318,4 @@ multidict = ">=4.0" [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "118bf8d4cb6d1ae95ee35c0b75060f3b1b2e9ed44521fc994c1a56ca1bc21b37" +content-hash = "f4a81d2f69d093b02c4861288d41ab79aa75959de1e69043566ef4cdbb6bd3de" diff --git a/integration_tests/pyproject.toml b/integration_tests/pyproject.toml index dc74bfc1f6..1d2fed78fa 100644 --- a/integration_tests/pyproject.toml +++ b/integration_tests/pyproject.toml @@ -26,7 +26,7 @@ cprotobuf = "^0.1.11" flaky = "^3.7" eth-bloom = "^3.0" eth-hash = "^0" -pyyaml = { git = "https://github.com/yaml/pyyaml.git", branch = "main" } +pyyaml = "^6.0.2rc1" [tool.poetry.dev-dependencies]