From e658fb099d1d99f3c69bb15fdee0d25613e0d9b2 Mon Sep 17 00:00:00 2001 From: Bertrand Juglas Date: Thu, 9 Nov 2023 17:52:16 +0100 Subject: [PATCH 1/5] add PGN and prepare for Arthera --- gnosis/eth/clients/blockscout_client.py | 3 +++ gnosis/eth/ethereum_network.py | 3 +++ gnosis/safe/addresses.py | 12 ++++++++++++ 3 files changed, 18 insertions(+) diff --git a/gnosis/eth/clients/blockscout_client.py b/gnosis/eth/clients/blockscout_client.py index a1dd23113..b3abfafc8 100644 --- a/gnosis/eth/clients/blockscout_client.py +++ b/gnosis/eth/clients/blockscout_client.py @@ -75,6 +75,9 @@ class BlockscoutClient: EthereumNetwork.CRONOS_TESTNET: "https://cronos.org/explorer/testnet3/graphiql", EthereumNetwork.THUNDERCORE_MAINNET: "https://explorer-mainnet.thundercore.com/graphiql", EthereumNetwork.THUNDERCORE_TESTNET: "https://explorer-testnet.thundercore.com/graphiql", + EthereumNetwork.PGN_MAINNET: "https://explorer.publicgoods.network/graphiql", + EthereumNetwork.PGN_TESTNET: "https://explorer.sepolia.publicgoods.network/graphiql", + EthereumNetwork.ARTHERA_TESTNET: "https://explorer-test.arthera.net/graphiql", } def __init__(self, network: EthereumNetwork): diff --git a/gnosis/eth/ethereum_network.py b/gnosis/eth/ethereum_network.py index 5f48f14fd..c2777705a 100644 --- a/gnosis/eth/ethereum_network.py +++ b/gnosis/eth/ethereum_network.py @@ -738,6 +738,9 @@ class EthereumNetwork(Enum): ZENIQ = 383414847825 PDC_MAINNET = 666301171999 MOLEREUM_NETWORK = 6022140761023 + PGN_MAINNET = 424 + PGN_TESTNET = 58008 + ARTHERA_TESTNET = 10243 @classmethod def _missing_(cls, value): diff --git a/gnosis/safe/addresses.py b/gnosis/safe/addresses.py index e73969513..d46242432 100644 --- a/gnosis/safe/addresses.py +++ b/gnosis/safe/addresses.py @@ -637,6 +637,12 @@ ("0x3E5c63644E683549055b9Be8653de26E0B4CD36E", 194005796, "1.3.0+L2"), ("0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552", 194005824, "1.3.0"), ], + EthereumNetwork.PGN_MAINNET: [ + ("0x3E5c63644E683549055b9Be8653de26E0B4CD36E", 344345, "1.3.0+L2"), + ], + EthereumNetwork.PGN_TESTNET: [ + ("0x3E5c63644E683549055b9Be8653de26E0B4CD36E", 1774114, "1.3.0+L2"), + ], } PROXY_FACTORIES: Dict[EthereumNetwork, List[Tuple[str, int]]] = { @@ -1060,4 +1066,10 @@ EthereumNetwork.TELOS_EVM_TESTNET: [ ("0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", 194005709), # v1.3.0 ], + EthereumNetwork.PGN_MAINNET: [ + ("0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", 344314), # v1.3.0 + ], + EthereumNetwork.PGN_TESTNET: [ + ("0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", 1774097), # v1.3.0 + ], } From f1f4b2bc53594b723b0173c6a7b60e490464b0b1 Mon Sep 17 00:00:00 2001 From: Sophia <59624772+sodew@users.noreply.github.com> Date: Mon, 27 Nov 2023 16:39:52 +0000 Subject: [PATCH 2/5] chain id in order --- gnosis/eth/ethereum_network.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnosis/eth/ethereum_network.py b/gnosis/eth/ethereum_network.py index c2777705a..18449c3ef 100644 --- a/gnosis/eth/ethereum_network.py +++ b/gnosis/eth/ethereum_network.py @@ -186,6 +186,7 @@ class EthereumNetwork(Enum): HYPERONCHAIN_TESTNET = 400 SX_NETWORK_MAINNET = 416 OPTIMISM_GOERLI_TESTNET = 420 + PGN_MAINNET = 424 ZEETH_CHAIN = 427 RUPAYA = 499 CAMINO_C_CHAIN = 500 @@ -476,6 +477,7 @@ class EthereumNetwork(Enum): SJATSH = 10086 BLOCKCHAIN_GENESIS_MAINNET = 10101 CHIADO_TESTNET = 10200 + ARTHERA_TESTNET = 10243 _0XTADE = 10248 NUMBERS_MAINNET = 10507 NUMBERS_TESTNET = 10508 @@ -561,6 +563,7 @@ class EthereumNetwork(Enum): REI_CHAIN_MAINNET = 55555 REI_CHAIN_TESTNET = 55556 BOBA_BNB_MAINNET = 56288 + PGN_TESTNET = 58008 LINEA_TESTNET = 59140 LINEA = 59144 THINKIUM_TESTNET_CHAIN_0 = 60000 @@ -738,9 +741,6 @@ class EthereumNetwork(Enum): ZENIQ = 383414847825 PDC_MAINNET = 666301171999 MOLEREUM_NETWORK = 6022140761023 - PGN_MAINNET = 424 - PGN_TESTNET = 58008 - ARTHERA_TESTNET = 10243 @classmethod def _missing_(cls, value): From 641a92a47bc0427635bb60475e7bc27507062518 Mon Sep 17 00:00:00 2001 From: Sophia <59624772+sodew@users.noreply.github.com> Date: Mon, 27 Nov 2023 16:53:26 +0000 Subject: [PATCH 3/5] added 1.3.0 contract version --- gnosis/safe/addresses.py | 1 + 1 file changed, 1 insertion(+) diff --git a/gnosis/safe/addresses.py b/gnosis/safe/addresses.py index d46242432..5b9df8f65 100644 --- a/gnosis/safe/addresses.py +++ b/gnosis/safe/addresses.py @@ -639,6 +639,7 @@ ], EthereumNetwork.PGN_MAINNET: [ ("0x3E5c63644E683549055b9Be8653de26E0B4CD36E", 344345, "1.3.0+L2"), + ("0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552", 344348, "1.3.0"), ], EthereumNetwork.PGN_TESTNET: [ ("0x3E5c63644E683549055b9Be8653de26E0B4CD36E", 1774114, "1.3.0+L2"), From 4da7e57d1961d8250cf1c848f2962fdfd2c8338b Mon Sep 17 00:00:00 2001 From: Bertrand Juglas Date: Mon, 27 Nov 2023 18:20:45 +0100 Subject: [PATCH 4/5] Update addresses.py For PGN testnet 1.3.0 deployment --- gnosis/safe/addresses.py | 1 + 1 file changed, 1 insertion(+) diff --git a/gnosis/safe/addresses.py b/gnosis/safe/addresses.py index 5b9df8f65..ed4cdd777 100644 --- a/gnosis/safe/addresses.py +++ b/gnosis/safe/addresses.py @@ -643,6 +643,7 @@ ], EthereumNetwork.PGN_TESTNET: [ ("0x3E5c63644E683549055b9Be8653de26E0B4CD36E", 1774114, "1.3.0+L2"), + ("0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552", 1774116, "1.3.0"), ], } From 413fb4fc3bb240db8518ef3e1254b3e9c92f09cf Mon Sep 17 00:00:00 2001 From: Bertrand Juglas Date: Mon, 27 Nov 2023 22:58:08 +0100 Subject: [PATCH 5/5] Add Arthera Testnet contracts --- gnosis/safe/addresses.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnosis/safe/addresses.py b/gnosis/safe/addresses.py index ed4cdd777..b209dbc19 100644 --- a/gnosis/safe/addresses.py +++ b/gnosis/safe/addresses.py @@ -645,6 +645,12 @@ ("0x3E5c63644E683549055b9Be8653de26E0B4CD36E", 1774114, "1.3.0+L2"), ("0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552", 1774116, "1.3.0"), ], + EthereumNetwork.ARTHERA_TESTNET: [ + ("0x29fcB43b46531BcA003ddC8FCB67FFE91900C762", 4186405, "1.4.1+L2"), + ("0x41675C099F32341bf84BFc5382aF534df5C7461a", 4186415, "1.4.1"), + ("0xfb1bffC9d739B8D520DaF37dF666da4C687191EA", 119967, "1.3.0+L2"), + ("0x69f4D1788e39c87893C980c06EdF4b7f686e2938", 119968, "1.3.0"), + ], } PROXY_FACTORIES: Dict[EthereumNetwork, List[Tuple[str, int]]] = { @@ -1074,4 +1080,8 @@ EthereumNetwork.PGN_TESTNET: [ ("0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", 1774097), # v1.3.0 ], + EthereumNetwork.ARTHERA_TESTNET: [ + ("0x4e1DCf7AD4e460CfD30791CCC4F9c8a4f820ec67", 4186337), # v1.4.1 + ("0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC", 119959), # v1.3.0 + ], }