Merge branch 'main' into update-gnosis-package

safe-global · Aug 23, 2024 · 671055c · 671055c
2 parents 3614288 + 39708b6
commit 671055c
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 2 deletions.
diff --git a/.github/workflows/create_pr_with_new_address.yml b/.github/workflows/create_pr_with_new_address.yml
@@ -112,7 +112,7 @@ jobs:
  - name: Install dependencies
  if: steps.check-comment.outputs.result == 'true'
  run: |
- pip install PyGithub safe-eth-py pre-commit
+ grep -E "web3" requirements.txt | xargs pip install PyGithub safe-eth-py pre-commit
  pre-commit install
 
  - name: Process Issue and Create PR

diff --git a/.github/workflows/validate_new_address_issue_input_data.yml b/.github/workflows/validate_new_address_issue_input_data.yml
@@ -64,7 +64,7 @@ jobs:
 
  - name: Install dependencies
  run: |
- pip install safe-eth-py validators tldextract
+ grep -E "web3" requirements.txt | xargs pip install safe-eth-py validators tldextract
 
  - name: Validate input data
  id: validate-input-data

diff --git a/safe_eth/eth/clients/blockscout_client.py b/safe_eth/eth/clients/blockscout_client.py
@@ -129,6 +129,8 @@ class BlockscoutClient:
  EthereumNetwork.FLARE_TESTNET_COSTON2: "https://coston2-explorer.flare.network/graphiql",
  EthereumNetwork.NAL_SEPOLIA_TESTNET: "https://testnet-scan.nal.network/api/v1/graphql",
  EthereumNetwork.ALEPH_ZERO_EVM: "https://evm-explorer.alephzero.org/api/v1/graphql",
+ EthereumNetwork.SKOPJE_TESTNET: "https://skopje-explorer.gptprotocol.io/api/v1/graphql",
+ EthereumNetwork.GPT_MAINNET: "https://explorer.gptprotocol.io/api/v1/graphql",
  }
 
  def __init__(self, network: EthereumNetwork):

diff --git a/safe_eth/safe/addresses.py b/safe_eth/safe/addresses.py
@@ -1673,6 +1673,54 @@
  "1.4.1+L2",
  ), # v1.4.1+L2
  ],
+ EthereumNetwork.NAL_MAINNET: [
+ ("0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552", 1777700, "1.3.0"), # v1.3.0
+ (
+ "0x3E5c63644E683549055b9Be8653de26E0B4CD36E",
+ 1777694,
+ "1.3.0+L2",
+ ), # v1.3.0+L2
+ ],
+ EthereumNetwork.CRONOS_ZKEVM_TESTNET: [
+ ("0xB00ce5CCcdEf57e539ddcEd01DF43a13855d9910", 163814, "1.3.0"), # v1.3.0
+ ("0x1727c2c531cf966f902E5927b98490fDFb3b2b70", 163812, "1.3.0+L2"), # v1.3.0+L2
+ ],
+ EthereumNetwork.CRONOS_ZKEVM_MAINNET: [
+ ("0xB00ce5CCcdEf57e539ddcEd01DF43a13855d9910", 6105, "1.3.0"), # v1.3.0
+ ("0x1727c2c531cf966f902E5927b98490fDFb3b2b70", 6104, "1.3.0+L2"), # v1.3.0+L2
+ ],
+ EthereumNetwork.SKOPJE_TESTNET: [
+ ("0x41675C099F32341bf84BFc5382aF534df5C7461a", 2845182, "1.4.1"), # v1.4.1
+ (
+ "0x29fcB43b46531BcA003ddC8FCB67FFE91900C762",
+ 2845179,
+ "1.4.1+L2",
+ ), # v1.4.1+L2
+ ],
+ EthereumNetwork.GPT_MAINNET: [
+ ("0x41675C099F32341bf84BFc5382aF534df5C7461a", 1358329, "1.4.1"), # v1.4.1
+ (
+ "0x29fcB43b46531BcA003ddC8FCB67FFE91900C762",
+ 1358326,
+ "1.4.1+L2",
+ ), # v1.4.1+L2
+ ],
+ EthereumNetwork.BEVM_TESTNET: [
+ ("0x41675C099F32341bf84BFc5382aF534df5C7461a", 1651910, "1.4.1"), # v1.4.1
+ (
+ "0x29fcB43b46531BcA003ddC8FCB67FFE91900C762",
+ 1651908,
+ "1.4.1+L2",
+ ), # v1.4.1+L2
+ ],
+ EthereumNetwork.BEVM_MAINNET: [
+ ("0x41675C099F32341bf84BFc5382aF534df5C7461a", 1571646, "1.4.1"), # v1.4.1
+ (
+ "0x29fcB43b46531BcA003ddC8FCB67FFE91900C762",
+ 1571644,
+ "1.4.1+L2",
+ ), # v1.4.1+L2
+ ],
 }
 
 PROXY_FACTORIES: Dict[EthereumNetwork, List[Tuple[str, int]]] = {
@@ -2516,4 +2564,25 @@
  EthereumNetwork.IRISHUB: [
  ("0x4e1DCf7AD4e460CfD30791CCC4F9c8a4f820ec67", 25909136), # v1.4.1
  ],
+ EthereumNetwork.NAL_MAINNET: [
+ ("0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", 1777652), # v1.3.0
+ ],
+ EthereumNetwork.CRONOS_ZKEVM_TESTNET: [
+ ("0xDAec33641865E4651fB43181C6DB6f7232Ee91c2", 163805), # v1.3.0
+ ],
+ EthereumNetwork.CRONOS_ZKEVM_MAINNET: [
+ ("0xDAec33641865E4651fB43181C6DB6f7232Ee91c2", 6097), # v1.3.0
+ ],
+ EthereumNetwork.SKOPJE_TESTNET: [
+ ("0x4e1DCf7AD4e460CfD30791CCC4F9c8a4f820ec67", 2845163), # v1.4.1
+ ],
+ EthereumNetwork.GPT_MAINNET: [
+ ("0x4e1DCf7AD4e460CfD30791CCC4F9c8a4f820ec67", 1358312), # v1.4.1
+ ],
+ EthereumNetwork.BEVM_TESTNET: [
+ ("0x4e1DCf7AD4e460CfD30791CCC4F9c8a4f820ec67", 1651896), # v1.4.1
+ ],
+ EthereumNetwork.BEVM_MAINNET: [
+ ("0x4e1DCf7AD4e460CfD30791CCC4F9c8a4f820ec67", 1571637), # v1.4.1
+ ],
 }