Merge branch 'master' into adding_zora_chain

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

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"),
@@ -501,6 +505,13 @@
  EthereumNetwork.ZORA_NETWORK: [
  ("0x3E5c63644E683549055b9Be8653de26E0B4CD36E", 11932, "1.3.0+L2"),
  ("0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552", 11934, "1.3.0"),
+ 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"),
  ],
 }
 
@@ -748,6 +759,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
  ],
@@ -835,6 +849,11 @@
  )
  ],
  EthereumNetwork.ZORA: [
- ("0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", 11914),
+ ("0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", 11914), # v1.3.0
+ EthereumNetwork.ZKSYNC_ALPHA_TESTNET: [
+ ("0xDAec33641865E4651fB43181C6DB6f7232Ee91c2", 8619849), # v1.3.0
+ ],
+ EthereumNetwork.ZKSYNC_V2: [
+ ("0xDAec33641865E4651fB43181C6DB6f7232Ee91c2", 7259190), # v1.3.0
  ],
 }

requirements-test.txt

@@ -1,8 +1,8 @@
 -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
-pytest-rerunfailures==11.1.2
+pytest-rerunfailures==12.0
 pytest-sugar==0.9.7