From 5a91688773d9000dffc9278184864b59279b2748 Mon Sep 17 00:00:00 2001 From: nick8319 Date: Fri, 7 Jul 2023 17:25:31 +0300 Subject: [PATCH 1/4] feat: add zkSync Era Mainnet and Testnet support --- gnosis/safe/addresses.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnosis/safe/addresses.py b/gnosis/safe/addresses.py index 342346dc7..94069dd94 100644 --- a/gnosis/safe/addresses.py +++ b/gnosis/safe/addresses.py @@ -498,6 +498,14 @@ "1.3.0+L2", ) ], + EthereumNetwork.ZKSYNC_ALPHA_TESTNET: [ + ("0x1727c2c531cf966f902E5927b98490fDFb3b2b70", 8619879, "1.3.0+L2"), + ("0xB00ce5CCcdEf57e539ddcEd01DF43a13855d9910", 8619884, "1.3.0"), + ], + EthereumNetwork.ZKSYNC_V2: [ + ("0x1727c2c531cf966f902E5927b98490fDFb3b2b70", 7259224, "1.3.0+L2"), + ("0xB00ce5CCcdEf57e539ddcEd01DF43a13855d9910", 7259230, "1.3.0"), + ], } PROXY_FACTORIES: Dict[EthereumNetwork, List[Tuple[str, int]]] = { @@ -830,4 +838,10 @@ 739882, ) ], + EthereumNetwork.ZKSYNC_ALPHA_TESTNET: [ + ("0xDAec33641865E4651fB43181C6DB6f7232Ee91c2", 8619849), # v1.3.0 + ], + EthereumNetwork.ZKSYNC_V2: [ + ("0xDAec33641865E4651fB43181C6DB6f7232Ee91c2", 7259190), # v1.3.0 + ], } From d7e1e519bc0f9cabfcd97b5dfe0e56b4620f816f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jul 2023 06:24:08 +0000 Subject: [PATCH 2/4] Bump pytest-rerunfailures from 11.1.2 to 12.0 Bumps [pytest-rerunfailures](https://github.com/pytest-dev/pytest-rerunfailures) from 11.1.2 to 12.0. - [Changelog](https://github.com/pytest-dev/pytest-rerunfailures/blob/master/CHANGES.rst) - [Commits](https://github.com/pytest-dev/pytest-rerunfailures/compare/11.1.2...12.0) --- updated-dependencies: - dependency-name: pytest-rerunfailures dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-test.txt b/requirements-test.txt index d0d24bc7d..5fe07f15f 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -4,5 +4,5 @@ faker==18.11.2 pytest==7.4.0 pytest-django==4.5.2 pytest-env==0.8.2 -pytest-rerunfailures==11.1.2 +pytest-rerunfailures==12.0 pytest-sugar==0.9.7 From 2b88d05eae69e56a9dc1bf2725fca600e5e63cba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jul 2023 06:24:13 +0000 Subject: [PATCH 3/4] Bump faker from 18.11.2 to 18.13.0 Bumps [faker](https://github.com/joke2k/faker) from 18.11.2 to 18.13.0. - [Release notes](https://github.com/joke2k/faker/releases) - [Changelog](https://github.com/joke2k/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/joke2k/faker/compare/v18.11.2...v18.13.0) --- updated-dependencies: - dependency-name: faker dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-test.txt b/requirements-test.txt index 5fe07f15f..d36ab7a42 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,6 +1,6 @@ -r requirements.txt coverage==7.2.7 -faker==18.11.2 +faker==18.13.0 pytest==7.4.0 pytest-django==4.5.2 pytest-env==0.8.2 From 25194d625139d8baa15282fbf16e056cfafd4e70 Mon Sep 17 00:00:00 2001 From: Uxio Fuentefria Date: Thu, 29 Jun 2023 12:56:49 +0200 Subject: [PATCH 4/4] Add BASE MAINNET safe addresses - Related to https://github.com/safe-global/safe-deployments/pull/249/files --- gnosis/eth/ethereum_network.py | 1 + gnosis/safe/addresses.py | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/gnosis/eth/ethereum_network.py b/gnosis/eth/ethereum_network.py index 07419d6e2..b3cac79b3 100644 --- a/gnosis/eth/ethereum_network.py +++ b/gnosis/eth/ethereum_network.py @@ -586,6 +586,7 @@ class EthereumNetwork(Enum): FIRENZE_TEST_NETWORK = 78110 GOLD_SMART_CHAIN_TESTNET = 79879 MUMBAI = 80001 + BASE_MAINNET = 8453 BASE_GOERLI_TESTNET = 84531 IVAR_CHAIN_MAINNET = 88888 BEVERLY_HILLS = 90210 diff --git a/gnosis/safe/addresses.py b/gnosis/safe/addresses.py index 94069dd94..483ef5890 100644 --- a/gnosis/safe/addresses.py +++ b/gnosis/safe/addresses.py @@ -377,6 +377,10 @@ ("0x3E5c63644E683549055b9Be8653de26E0B4CD36E", 42293309, "1.3.0+L2"), ("0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552", 42293315, "1.3.0"), ], + EthereumNetwork.BASE_MAINNET: [ + ("0xfb1bffC9d739B8D520DaF37dF666da4C687191EA", 595207, "1.3.0+L2"), + ("0x69f4D1788e39c87893C980c06EdF4b7f686e2938", 595211, "1.3.0"), + ], EthereumNetwork.BASE_GOERLI_TESTNET: [ ("0xfb1bffC9d739B8D520DaF37dF666da4C687191EA", 938848, "1.3.0+L2"), ("0x69f4D1788e39c87893C980c06EdF4b7f686e2938", 939064, "1.3.0"), @@ -752,6 +756,9 @@ EthereumNetwork.XDC_APOTHEM_NETWORK: [ ("0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", 42293264), # v1.3.0 ], + EthereumNetwork.BASE_MAINNET: [ + ("0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC", 595181), # v1.3.0 + ], EthereumNetwork.BASE_GOERLI_TESTNET: [ ("0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC", 938696), # v1.3.0 ],