From d97689a8b410423e996de4780b9aea120fc24469 Mon Sep 17 00:00:00 2001 From: Daniel <25051234+dasanra@users.noreply.github.com> Date: Wed, 2 Oct 2024 11:34:36 +0200 Subject: [PATCH 1/4] feat: add CELO canonical addresses --- safe_eth/safe/addresses.py | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/safe_eth/safe/addresses.py b/safe_eth/safe/addresses.py index abdb334a..f4ddea9e 100644 --- a/safe_eth/safe/addresses.py +++ b/safe_eth/safe/addresses.py @@ -221,8 +221,26 @@ ), # default singleton address ], EthereumNetwork.CELO_MAINNET: [ - ("0xfb1bffC9d739B8D520DaF37dF666da4C687191EA", 8944350, "1.3.0+L2"), - ("0x69f4D1788e39c87893C980c06EdF4b7f686e2938", 8944351, "1.3.0"), + ( + "0xfb1bffC9d739B8D520DaF37dF666da4C687191EA", + 8944350, + "1.3.0+L2" + ), # safe singleton address + ( + "0x3E5c63644E683549055b9Be8653de26E0B4CD36E", + 23700081, + "1.3.0+L2", + ), # default singleton address + ( + "0x69f4D1788e39c87893C980c06EdF4b7f686e2938", + 8944351, + "1.3.0" + ), # safe singleton address + ( + "0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552", + 23700082, + "1.3.0", + ), # default singleton address ("0x41675C099F32341bf84BFc5382aF534df5C7461a", 23116909, "1.4.1"), # v1.4.1 ( "0x29fcB43b46531BcA003ddC8FCB67FFE91900C762", @@ -1899,7 +1917,14 @@ ), # v1.3.0 default singleton address ], EthereumNetwork.CELO_MAINNET: [ - ("0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC", 8944342), # v1.3.0 + ( + "0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC", + 8944342 + ), # v1.3.0 safe singleton address + ( + "0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", + 23700074, + ), # v1.3.0 default singleton address ("0x4e1DCf7AD4e460CfD30791CCC4F9c8a4f820ec67", 23116898), # v1.4.1 ], EthereumNetwork.AVALANCHE_C_CHAIN: [ From ee6bb49bd329ead08dccf734713cfbf16359c822 Mon Sep 17 00:00:00 2001 From: Daniel <25051234+dasanra@users.noreply.github.com> Date: Wed, 2 Oct 2024 11:43:51 +0200 Subject: [PATCH 2/4] feat: add MANTLE canonical addresses --- safe_eth/safe/addresses.py | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/safe_eth/safe/addresses.py b/safe_eth/safe/addresses.py index f4ddea9e..05fe71dc 100644 --- a/safe_eth/safe/addresses.py +++ b/safe_eth/safe/addresses.py @@ -762,8 +762,26 @@ ("0x69f4D1788e39c87893C980c06EdF4b7f686e2938", 4404284, "1.3.0"), ], EthereumNetwork.MANTLE: [ - ("0xfb1bffC9d739B8D520DaF37dF666da4C687191EA", 1511, "1.3.0+L2"), - ("0x69f4D1788e39c87893C980c06EdF4b7f686e2938", 1512, "1.3.0"), + ( + "0xfb1bffC9d739B8D520DaF37dF666da4C687191EA", + 1511, + "1.3.0+L2" + ), # safe singleton address + ( + "0x3E5c63644E683549055b9Be8653de26E0B4CD36E", + 5292901, + "1.3.0+L2", + ), # default singleton address + ( + "0x69f4D1788e39c87893C980c06EdF4b7f686e2938", + 1512, + "1.3.0" + ), # safe singleton address + ( + "0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552", + 5292915, + "1.3.0", + ), # default singleton address ("0x41675C099F32341bf84BFc5382aF534df5C7461a", 57306677, "1.4.1"), # v1.4.1 ( "0x29fcB43b46531BcA003ddC8FCB67FFE91900C762", @@ -1920,11 +1938,11 @@ ( "0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC", 8944342 - ), # v1.3.0 safe singleton address + ), # v1.3.0 safe proxy factory address ( "0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", 23700074, - ), # v1.3.0 default singleton address + ), # v1.3.0 default proxy factory address ("0x4e1DCf7AD4e460CfD30791CCC4F9c8a4f820ec67", 23116898), # v1.4.1 ], EthereumNetwork.AVALANCHE_C_CHAIN: [ @@ -2212,7 +2230,14 @@ ("0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC", 4404053), # v1.3.0 ], EthereumNetwork.MANTLE: [ - ("0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC", 1504), # v1.3.0 + ( + "0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC", + 1504 + ), # v1.3.0 safe proxy factory address + ( + "0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", + 5292797, + ), # v1.3.0 default proxy factory address ("0x4e1DCf7AD4e460CfD30791CCC4F9c8a4f820ec67", 57306582), # v1.4.1 ], EthereumNetwork.CASCADIA_TESTNET: [ From 5e7e3d49524b4fbd5fbf0125b20dda269dc795ff Mon Sep 17 00:00:00 2001 From: Daniel <25051234+dasanra@users.noreply.github.com> Date: Wed, 2 Oct 2024 12:36:27 +0200 Subject: [PATCH 3/4] feat: add X_LAYER canonical 1.3.0 and 1.4.1 addresses --- safe_eth/safe/addresses.py | 88 ++++++++++++++++++++++++++++++-------- 1 file changed, 69 insertions(+), 19 deletions(-) diff --git a/safe_eth/safe/addresses.py b/safe_eth/safe/addresses.py index 05fe71dc..542511e3 100644 --- a/safe_eth/safe/addresses.py +++ b/safe_eth/safe/addresses.py @@ -225,22 +225,22 @@ "0xfb1bffC9d739B8D520DaF37dF666da4C687191EA", 8944350, "1.3.0+L2" - ), # safe singleton address + ), # 1.3.0+L2 safe singleton address ( "0x3E5c63644E683549055b9Be8653de26E0B4CD36E", 23700081, "1.3.0+L2", - ), # default singleton address + ), # 1.3.0+L2 default singleton address ( "0x69f4D1788e39c87893C980c06EdF4b7f686e2938", 8944351, "1.3.0" - ), # safe singleton address + ), # 1.3.0 safe singleton address ( "0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552", 23700082, "1.3.0", - ), # default singleton address + ), # 1.3.0 default singleton address ("0x41675C099F32341bf84BFc5382aF534df5C7461a", 23116909, "1.4.1"), # v1.4.1 ( "0x29fcB43b46531BcA003ddC8FCB67FFE91900C762", @@ -766,22 +766,22 @@ "0xfb1bffC9d739B8D520DaF37dF666da4C687191EA", 1511, "1.3.0+L2" - ), # safe singleton address + ), # 1.3.0+L2 safe singleton address ( "0x3E5c63644E683549055b9Be8653de26E0B4CD36E", 5292901, "1.3.0+L2", - ), # default singleton address + ), # 1.3.0+L2 default singleton address ( "0x69f4D1788e39c87893C980c06EdF4b7f686e2938", 1512, "1.3.0" - ), # safe singleton address + ), # 1.3.0 safe singleton address ( "0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552", 5292915, "1.3.0", - ), # default singleton address + ), # 1.3.0 default singleton address ("0x41675C099F32341bf84BFc5382aF534df5C7461a", 57306677, "1.4.1"), # v1.4.1 ( "0x29fcB43b46531BcA003ddC8FCB67FFE91900C762", @@ -1309,8 +1309,32 @@ ("0x29fcB43b46531BcA003ddC8FCB67FFE91900C762", 281864, "1.4.1+L2"), # v1.4.1+L2 ], EthereumNetwork.X_LAYER_MAINNET: [ - ("0x69f4D1788e39c87893C980c06EdF4b7f686e2938", 359517, "1.3.0"), # v1.3.0 - ("0xfb1bffC9d739B8D520DaF37dF666da4C687191EA", 359442, "1.3.0+L2"), # v1.3.0+L2 + ( + "0x69f4D1788e39c87893C980c06EdF4b7f686e2938", + 359517, + "1.3.0" + ), # v1.3.0 safe singleton address + ( + "0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552", + 71844, + "1.3.0" + ), # v1.3.0 default singleton address + ( + "0xfb1bffC9d739B8D520DaF37dF666da4C687191EA", + 359442, + "1.3.0+L2" + ), # v1.3.0+L2 safe singleton address + ( + "0x3E5c63644E683549055b9Be8653de26E0B4CD36E", + 100691, + "1.3.0+L2" + ), # v1.3.0+L2 default singleton address + ("0x41675C099F32341bf84BFc5382aF534df5C7461a", 3752736, "1.4.1"), # v1.4.1 + ( + "0x29fcB43b46531BcA003ddC8FCB67FFE91900C762", + 3752752, + "1.4.1+L2" + ), # v1.4.1+L2 ], EthereumNetwork.PULSECHAIN: [ ("0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552", 12504268, "1.3.0"), # v1.3.0 @@ -1928,11 +1952,11 @@ ( "0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC", 28059981, - ), # v1.3.0 safe singleton address + ), # v1.3.0 safe proxy factory address ( "0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", 8485873, - ), # v1.3.0 default singleton address + ), # v1.3.0 default proxy factory address ], EthereumNetwork.CELO_MAINNET: [ ( @@ -2469,22 +2493,48 @@ ("0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", 53901564), # v1.3.0 ], EthereumNetwork.OP_CELESTIA_RASPBERRY: [ - ("0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", 1028156), # v1.3.0 - ("0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC", 6038388), # v1.3.0 + ( + "0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", + 1028156 + ), # v1.3.0 default proxy factory address + ( + "0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC", + 6038388 + ), # v1.3.0 safe proxy factory address ("0x4e1DCf7AD4e460CfD30791CCC4F9c8a4f820ec67", 7101196), # v1.4.1 ], EthereumNetwork.POLYGON_BLACKBERRY: [ - ("0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", 765141), # v1.3.0 - ("0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC", 1194297), # v1.3.0 + ( + "0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", + 765141 + ), # v1.3.0 default proxy factory address + ( + "0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC", + 1194297 + ), # v1.3.0 safe proxy factory address ("0x4e1DCf7AD4e460CfD30791CCC4F9c8a4f820ec67", 1725488), # v1.4.1 ], EthereumNetwork.ARBITRUM_BLUEBERRY: [ - ("0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", 19364), # v1.3.0 - ("0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC", 42024), # v1.3.0 + ( + "0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", + 19364 + ), # v1.3.0 default proxy factory address + ( + "0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC", + 42024 + ), # v1.3.0 safe proxy factory address ("0x4e1DCf7AD4e460CfD30791CCC4F9c8a4f820ec67", 281856), # v1.4.1 ], EthereumNetwork.X_LAYER_MAINNET: [ - ("0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC", 359536), # v1.3.0 + ( + "0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC", + 359536 + ), # v1.3.0 safe proxy factory address + ( + "0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", + 71695 + ), # v1.3.0 default proxy factory address + ("0x4e1DCf7AD4e460CfD30791CCC4F9c8a4f820ec67", 3752781), # v1.4.1 ], EthereumNetwork.PULSECHAIN: [ ("0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", 12504126), # v1.3.0 From f1cb19c5d460e54b29d69884941edd20f015b18a Mon Sep 17 00:00:00 2001 From: Daniel <25051234+dasanra@users.noreply.github.com> Date: Wed, 2 Oct 2024 16:28:09 +0200 Subject: [PATCH 4/4] chore: fix linting issues --- safe_eth/safe/addresses.py | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/safe_eth/safe/addresses.py b/safe_eth/safe/addresses.py index 542511e3..4e01cf7c 100644 --- a/safe_eth/safe/addresses.py +++ b/safe_eth/safe/addresses.py @@ -224,7 +224,7 @@ ( "0xfb1bffC9d739B8D520DaF37dF666da4C687191EA", 8944350, - "1.3.0+L2" + "1.3.0+L2", ), # 1.3.0+L2 safe singleton address ( "0x3E5c63644E683549055b9Be8653de26E0B4CD36E", @@ -234,7 +234,7 @@ ( "0x69f4D1788e39c87893C980c06EdF4b7f686e2938", 8944351, - "1.3.0" + "1.3.0", ), # 1.3.0 safe singleton address ( "0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552", @@ -765,7 +765,7 @@ ( "0xfb1bffC9d739B8D520DaF37dF666da4C687191EA", 1511, - "1.3.0+L2" + "1.3.0+L2", ), # 1.3.0+L2 safe singleton address ( "0x3E5c63644E683549055b9Be8653de26E0B4CD36E", @@ -775,7 +775,7 @@ ( "0x69f4D1788e39c87893C980c06EdF4b7f686e2938", 1512, - "1.3.0" + "1.3.0", ), # 1.3.0 safe singleton address ( "0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552", @@ -1312,28 +1312,28 @@ ( "0x69f4D1788e39c87893C980c06EdF4b7f686e2938", 359517, - "1.3.0" + "1.3.0", ), # v1.3.0 safe singleton address ( "0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552", 71844, - "1.3.0" + "1.3.0", ), # v1.3.0 default singleton address ( "0xfb1bffC9d739B8D520DaF37dF666da4C687191EA", 359442, - "1.3.0+L2" + "1.3.0+L2", ), # v1.3.0+L2 safe singleton address ( "0x3E5c63644E683549055b9Be8653de26E0B4CD36E", 100691, - "1.3.0+L2" + "1.3.0+L2", ), # v1.3.0+L2 default singleton address ("0x41675C099F32341bf84BFc5382aF534df5C7461a", 3752736, "1.4.1"), # v1.4.1 ( "0x29fcB43b46531BcA003ddC8FCB67FFE91900C762", 3752752, - "1.4.1+L2" + "1.4.1+L2", ), # v1.4.1+L2 ], EthereumNetwork.PULSECHAIN: [ @@ -1961,7 +1961,7 @@ EthereumNetwork.CELO_MAINNET: [ ( "0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC", - 8944342 + 8944342, ), # v1.3.0 safe proxy factory address ( "0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", @@ -2256,7 +2256,7 @@ EthereumNetwork.MANTLE: [ ( "0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC", - 1504 + 1504, ), # v1.3.0 safe proxy factory address ( "0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", @@ -2495,44 +2495,44 @@ EthereumNetwork.OP_CELESTIA_RASPBERRY: [ ( "0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", - 1028156 + 1028156, ), # v1.3.0 default proxy factory address ( "0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC", - 6038388 + 6038388, ), # v1.3.0 safe proxy factory address ("0x4e1DCf7AD4e460CfD30791CCC4F9c8a4f820ec67", 7101196), # v1.4.1 ], EthereumNetwork.POLYGON_BLACKBERRY: [ ( "0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", - 765141 + 765141, ), # v1.3.0 default proxy factory address ( "0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC", - 1194297 + 1194297, ), # v1.3.0 safe proxy factory address ("0x4e1DCf7AD4e460CfD30791CCC4F9c8a4f820ec67", 1725488), # v1.4.1 ], EthereumNetwork.ARBITRUM_BLUEBERRY: [ ( "0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", - 19364 + 19364, ), # v1.3.0 default proxy factory address ( "0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC", - 42024 + 42024, ), # v1.3.0 safe proxy factory address ("0x4e1DCf7AD4e460CfD30791CCC4F9c8a4f820ec67", 281856), # v1.4.1 ], EthereumNetwork.X_LAYER_MAINNET: [ ( "0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC", - 359536 + 359536, ), # v1.3.0 safe proxy factory address ( "0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", - 71695 + 71695, ), # v1.3.0 default proxy factory address ("0x4e1DCf7AD4e460CfD30791CCC4F9c8a4f820ec67", 3752781), # v1.4.1 ],