Update evm tests e2e image

sprintertech · Oct 30, 2024 · 6c272b7 · 6c272b7
1 parent a97382e
commit 6c272b7
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 43 deletions.
diff --git a/e2e/evm/util.go b/e2e/evm/util.go
@@ -79,28 +79,28 @@ type BridgeConfig struct {
 
 var DEFAULT_CONFIG = BridgeConfig{
 	BridgeAddr: common.HexToAddress("0x6CdE2Cd82a4F8B74693Ff5e194c19CA08c2d1c68"),
-	RetryAddr:  common.HexToAddress("0x8E85C30C137953Ce6804E16E73061E408E580372"),
+	RetryAddr:  common.HexToAddress("0xAD825082B91980E7C8908652269c96a47D687cC5"),
 
-	Erc20Addr:        common.HexToAddress("0x78E5b9cEC9aEA29071f070C8cC561F692B3511A6"),
-	Erc20HandlerAddr: common.HexToAddress("0x02091EefF969b33A5CE8A729DaE325879bf76f90"),
+	Erc20Addr:        common.HexToAddress("0x783BB8123b8532CC85C8D2deF2f47C55D1e46b46"),
+	Erc20HandlerAddr: common.HexToAddress("0xF28c11CB14C6d2B806f99EA8b138F65e74a1Ed66"),
 	Erc20ResourceID:  SliceTo32Bytes(common.LeftPadBytes([]byte{0}, 31)),
 
-	Erc20LockReleaseAddr:        common.HexToAddress("0x1ED1d77911944622FCcDDEad8A731fd77E94173e"),
-	Erc20LockReleaseHandlerAddr: common.HexToAddress("0x02091EefF969b33A5CE8A729DaE325879bf76f90"),
+	Erc20LockReleaseAddr:        common.HexToAddress("0xA45E01c8D945D47ADa916828828B201d0815b83F"),
+	Erc20LockReleaseHandlerAddr: common.HexToAddress("0xF28c11CB14C6d2B806f99EA8b138F65e74a1Ed66"),
 	Erc20LockReleaseResourceID:  SliceTo32Bytes(common.LeftPadBytes([]byte{3}, 31)),
 
-	Erc721Addr:        common.HexToAddress("0xa4640d1315Be1f88aC4F81546AA2C785cf247C31"),
-	Erc721HandlerAddr: common.HexToAddress("0xC2D334e2f27A9dB2Ed8C4561De86C1A00EBf6760"),
+	Erc721Addr:        common.HexToAddress("0x67272Fa6DB7ADa1639736753eD99f9D0C9e1450D"),
+	Erc721HandlerAddr: common.HexToAddress("0xF28c11CB14C6d2B806f99EA8b138F65e74a1Ed66"),
 	Erc721ResourceID:  SliceTo32Bytes(common.LeftPadBytes([]byte{2}, 31)),
 
 	PermissionlessGenericResourceID: SliceTo32Bytes(common.LeftPadBytes([]byte{5}, 31)),
 
 	Erc1155ResourceID:  SliceTo32Bytes(common.LeftPadBytes([]byte{4}, 31)),
-	Erc1155HandlerAddr: common.HexToAddress("0x5e6924e6A120bd833617D0873f0a1b747ee2D743"),
-	Erc1155Addr:        common.HexToAddress("0x6a7C2f9BCb884Dac619680e2E1319ff0a7Ffd6b8"),
+	Erc1155HandlerAddr: common.HexToAddress("0xE54Dc792c226AEF99D6086527b98b36a4ADDe56a"),
+	Erc1155Addr:        common.HexToAddress("0x9Fd58882b82EFaD2867f7eaB43539907bc07C360"),
 
-	BasicFeeHandlerAddr: common.HexToAddress("0x1CcB4231f2ff299E1E049De76F0a1D2B415C563A"),
-	FeeRouterAddress:    common.HexToAddress("0xF28c11CB14C6d2B806f99EA8b138F65e74a1Ed66"),
+	BasicFeeHandlerAddr: common.HexToAddress("0x8dA96a8C2b2d3e5ae7e668d0C94393aa8D5D3B94"),
+	FeeRouterAddress:    common.HexToAddress("0x1CcB4231f2ff299E1E049De76F0a1D2B415C563A"),
 	BasicFee:            BasicFee,
 }
 

diff --git a/example/cfg/config_evm-evm_1.json b/example/cfg/config_evm-evm_1.json
@@ -24,23 +24,23 @@
       "type": "evm",
       "endpoint": "ws://evm1-1:8545",
       "bridge": "0x6CdE2Cd82a4F8B74693Ff5e194c19CA08c2d1c68",
-      "retry": "0x8E85C30C137953Ce6804E16E73061E408E580372",
+      "retry": "0xAD825082B91980E7C8908652269c96a47D687cC5",
       "handlers": [
         {
           "type": "erc20",
-          "address": "0x02091EefF969b33A5CE8A729DaE325879bf76f90"
+          "address": "0xC2D334e2f27A9dB2Ed8C4561De86C1A00EBf6760"
         },
         {
           "type": "erc721",
-          "address": "0xC2D334e2f27A9dB2Ed8C4561De86C1A00EBf6760"
+          "address": "0xF28c11CB14C6d2B806f99EA8b138F65e74a1Ed66"
         },
         {
           "type": "erc1155",
-          "address": "0x9Fd58882b82EFaD2867f7eaB43539907bc07C360"
+          "address": "0xE54Dc792c226AEF99D6086527b98b36a4ADDe56a"
         },
         {
           "type": "permissionlessGeneric",
-          "address": "0x0047F2dBE11537aD513DCcdb07728D5d4DB68308"
+          "address": "0x94e9070f0354b69E7FB583134A820949A390D341"
         }
       ],
       "gasLimit": 9000000,
@@ -54,23 +54,23 @@
       "type": "evm",
       "endpoint": "ws://evm2-1:8545",
       "bridge": "0x6CdE2Cd82a4F8B74693Ff5e194c19CA08c2d1c68",
-      "retry": "0x8E85C30C137953Ce6804E16E73061E408E580372",
+      "retry": "0xAD825082B91980E7C8908652269c96a47D687cC5",
       "handlers": [
         {
           "type": "erc20",
-          "address": "0x02091EefF969b33A5CE8A729DaE325879bf76f90"
+          "address": "0xC2D334e2f27A9dB2Ed8C4561De86C1A00EBf6760"
         },
         {
           "type": "erc721",
-          "address": "0xC2D334e2f27A9dB2Ed8C4561De86C1A00EBf6760"
+          "address": "0xF28c11CB14C6d2B806f99EA8b138F65e74a1Ed66"
         },
         {
           "type": "erc1155",
-          "address": "0x9Fd58882b82EFaD2867f7eaB43539907bc07C360"
+          "address": "0xE54Dc792c226AEF99D6086527b98b36a4ADDe56a"
         },
         {
           "type": "permissionlessGeneric",
-          "address": "0x0047F2dBE11537aD513DCcdb07728D5d4DB68308"
+          "address": "0x94e9070f0354b69E7FB583134A820949A390D341"
         }
       ],
       "gasLimit": 9000000,

diff --git a/example/cfg/config_evm-evm_2.json b/example/cfg/config_evm-evm_2.json
@@ -24,23 +24,23 @@
       "type": "evm",
       "endpoint": "ws://evm1-1:8545",
       "bridge": "0x6CdE2Cd82a4F8B74693Ff5e194c19CA08c2d1c68",
-      "retry": "0x8E85C30C137953Ce6804E16E73061E408E580372",
+      "retry": "0xAD825082B91980E7C8908652269c96a47D687cC5",
       "handlers": [
         {
           "type": "erc20",
-          "address": "0x02091EefF969b33A5CE8A729DaE325879bf76f90"
+          "address": "0xC2D334e2f27A9dB2Ed8C4561De86C1A00EBf6760"
         },
         {
           "type": "erc721",
-          "address": "0xC2D334e2f27A9dB2Ed8C4561De86C1A00EBf6760"
+          "address": "0xF28c11CB14C6d2B806f99EA8b138F65e74a1Ed66"
         },
         {
           "type": "erc1155",
-          "address": "0x9Fd58882b82EFaD2867f7eaB43539907bc07C360"
+          "address": "0xE54Dc792c226AEF99D6086527b98b36a4ADDe56a"
         },
         {
           "type": "permissionlessGeneric",
-          "address": "0x0047F2dBE11537aD513DCcdb07728D5d4DB68308"
+          "address": "0x94e9070f0354b69E7FB583134A820949A390D341"
         }
       ],
       "gasLimit": 9000000,
@@ -54,23 +54,23 @@
       "type": "evm",
       "endpoint": "ws://evm2-1:8545",
       "bridge": "0x6CdE2Cd82a4F8B74693Ff5e194c19CA08c2d1c68",
-      "retry": "0x8E85C30C137953Ce6804E16E73061E408E580372",
+      "retry": "0xAD825082B91980E7C8908652269c96a47D687cC5",
       "handlers": [
         {
           "type": "erc20",
-          "address": "0x02091EefF969b33A5CE8A729DaE325879bf76f90"
+          "address": "0xC2D334e2f27A9dB2Ed8C4561De86C1A00EBf6760"
         },
         {
           "type": "erc721",
-          "address": "0xC2D334e2f27A9dB2Ed8C4561De86C1A00EBf6760"
+          "address": "0xF28c11CB14C6d2B806f99EA8b138F65e74a1Ed66"
         },
         {
           "type": "erc1155",
-          "address": "0x9Fd58882b82EFaD2867f7eaB43539907bc07C360"
+          "address": "0xE54Dc792c226AEF99D6086527b98b36a4ADDe56a"
         },
         {
           "type": "permissionlessGeneric",
-          "address": "0x0047F2dBE11537aD513DCcdb07728D5d4DB68308"
+          "address": "0x94e9070f0354b69E7FB583134A820949A390D341"
         }
       ],
       "gasLimit": 9000000,

diff --git a/example/cfg/config_evm-evm_3.json b/example/cfg/config_evm-evm_3.json
@@ -24,23 +24,23 @@
       "type": "evm",
       "endpoint": "ws://evm1-1:8545",
       "bridge": "0x6CdE2Cd82a4F8B74693Ff5e194c19CA08c2d1c68",
-      "retry": "0x8E85C30C137953Ce6804E16E73061E408E580372",
+      "retry": "0xAD825082B91980E7C8908652269c96a47D687cC5",
       "handlers": [
         {
           "type": "erc20",
-          "address": "0x02091EefF969b33A5CE8A729DaE325879bf76f90"
+          "address": "0xC2D334e2f27A9dB2Ed8C4561De86C1A00EBf6760"
         },
         {
           "type": "erc721",
-          "address": "0xC2D334e2f27A9dB2Ed8C4561De86C1A00EBf6760"
+          "address": "0xF28c11CB14C6d2B806f99EA8b138F65e74a1Ed66"
         },
         {
           "type": "erc1155",
-          "address": "0x9Fd58882b82EFaD2867f7eaB43539907bc07C360"
+          "address": "0xE54Dc792c226AEF99D6086527b98b36a4ADDe56a"
         },
         {
           "type": "permissionlessGeneric",
-          "address": "0x0047F2dBE11537aD513DCcdb07728D5d4DB68308"
+          "address": "0x94e9070f0354b69E7FB583134A820949A390D341"
         }
       ],
       "gasLimit": 9000000,
@@ -54,23 +54,23 @@
       "type": "evm",
       "endpoint": "ws://evm2-1:8545",
       "bridge": "0x6CdE2Cd82a4F8B74693Ff5e194c19CA08c2d1c68",
-      "retry": "0x8E85C30C137953Ce6804E16E73061E408E580372",
+      "retry": "0xAD825082B91980E7C8908652269c96a47D687cC5",
       "handlers": [
         {
           "type": "erc20",
-          "address": "0x02091EefF969b33A5CE8A729DaE325879bf76f90"
+          "address": "0xC2D334e2f27A9dB2Ed8C4561De86C1A00EBf6760"
         },
         {
           "type": "erc721",
-          "address": "0xC2D334e2f27A9dB2Ed8C4561De86C1A00EBf6760"
+          "address": "0xF28c11CB14C6d2B806f99EA8b138F65e74a1Ed66"
         },
         {
           "type": "erc1155",
-          "address": "0x9Fd58882b82EFaD2867f7eaB43539907bc07C360"
+          "address": "0xE54Dc792c226AEF99D6086527b98b36a4ADDe56a"
         },
         {
           "type": "permissionlessGeneric",
-          "address": "0x0047F2dBE11537aD513DCcdb07728D5d4DB68308"
+          "address": "0x94e9070f0354b69E7FB583134A820949A390D341"
         }
       ],
       "gasLimit": 9000000,

diff --git a/example/docker-compose.yml b/example/docker-compose.yml
@@ -29,7 +29,7 @@ services:
     entrypoint: /cfg/entrypoint/entrypoint.sh
 
   evm1-1:
-    image: ghcr.io/sygmaprotocol/sygma-solidity:evm1-latest
+    image: ghcr.io/sygmaprotocol/sygma-solidity:evm1-v2.10.1
     container_name: evm1-1
     command: ganache-cli --chainId 1337 -d --db data/ --blockTime 2 > /dev/null
     logging:
@@ -38,7 +38,7 @@ services:
       - "8545:8545"
 
   evm2-1:
-    image: ghcr.io/sygmaprotocol/sygma-solidity:evm2-latest
+    image: ghcr.io/sygmaprotocol/sygma-solidity:evm2-v2.10.1
     command: ganache-cli --chainId 1338 -d --db data/ --blockTime 2 > /dev/null
     container_name: evm2-1
     logging: