updated wormhole to use docker networking for arm64 (mac)

projects/evm-messenger/package-lock.json

@@ -2395,6 +2395,7 @@
             "version": "4.0.5",
             "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.5.tgz",
             "integrity": "sha512-HTm14iMQKK2FjFLRTM5lAVcyaUzOnqbPtesFIvREgXpJHdQm8bWS+GkQgIkfaBYRHuCnea7w8UVNfwiAQhlr9A==",
+            "hasInstallScript": true,
             "optional": true,
             "dependencies": {
                 "node-gyp-build": "^4.3.0"
@@ -2684,6 +2685,7 @@
             "version": "5.0.7",
             "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.7.tgz",
             "integrity": "sha512-vLt1O5Pp+flcArHGIyKEQq883nBt8nN8tVBcoL0qUXj2XT1n7p70yGIq2VK98I5FdZ1YHc0wk/koOnHjnXWk1Q==",
+            "hasInstallScript": true,
             "optional": true,
             "dependencies": {
                 "node-gyp-build": "^4.3.0"

projects/evm-messenger/wormhole.sh

@@ -46,67 +46,68 @@ cd ../../
 
 # Run Guardiand
 if [ $(uname -m) = "arm64" ]; then
-    docker run -d --name guardiand --network host --platform linux/amd64 --hostname guardian-0 --cap-add=IPC_LOCK --entrypoint /guardiand guardian node \
+    docker run -d --name guardiand -p 7070:7070 -p 7071:7071 -p 7073:7073 --platform linux/amd64 --hostname guardian-0 --cap-add=IPC_LOCK --entrypoint /guardiand guardian node \
         --unsafeDevMode --guardianKey /tmp/bridge.key --publicRPC "[::]:7070" --publicWeb "[::]:7071" --adminSocket /tmp/admin.sock --dataDir /tmp/data \
-        --ethRPC ws://localhost:8545 \
+        --ethRPC ws://host.docker.internal:8545 \
         --ethContract "0xC89Ce4735882C9F0f0FE26686c53074E09B0D550" \
-        --bscRPC ws://localhost:8546 \
+        --bscRPC ws://host.docker.internal:8546 \
         --bscContract "0xC89Ce4735882C9F0f0FE26686c53074E09B0D550" \
-        --polygonRPC ws://localhost:8545 \
-        --avalancheRPC ws://localhost:8545 \
-        --auroraRPC ws://localhost:8545 \
-        --fantomRPC ws://localhost:8545 \
-        --oasisRPC ws://localhost:8545 \
-        --karuraRPC ws://localhost:8545 \
-        --acalaRPC ws://localhost:8545 \
-        --klaytnRPC ws://localhost:8545 \
-        --celoRPC ws://localhost:8545 \
-        --moonbeamRPC ws://localhost:8545 \
-        --neonRPC ws://localhost:8545 \
-        --terraWS ws://localhost:8545 \
-        --terra2WS ws://localhost:8545 \
-        --terraLCD https://http://terra-terrad:1317 \
-        --terra2LCD http://localhost:1317  \
+        --polygonRPC ws://host.docker.internal:8545 \
+        --avalancheRPC ws://host.docker.internal:8545 \
+        --auroraRPC ws://host.docker.internal:8545 \
+        --fantomRPC ws://host.docker.internal:8545 \
+        --oasisRPC ws://host.docker.internal:8545 \
+        --karuraRPC ws://host.docker.internal:8545 \
+        --acalaRPC ws://host.docker.internal:8545 \
+        --klaytnRPC ws://host.docker.internal:8545 \
+        --celoRPC ws://host.docker.internal:8545 \
+        --moonbeamRPC ws://host.docker.internal:8545 \
+        --neonRPC ws://host.docker.internal:8545 \
+        --terraWS ws://host.docker.internal:8545 \
+        --terra2WS ws://host.docker.internal:8545 \
+        --terraLCD https://host.docker.internal:1317 \
+        --terra2LCD http://host.docker.internal:1317  \
         --terraContract terra18vd8fpwxzck93qlwghaj6arh4p7c5n896xzem5 \
         --terra2Contract terra18vd8fpwxzck93qlwghaj6arh4p7c5n896xzem5 \
         --solanaContract Bridge1p5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o \
-        --solanaWS ws://localhost:8900 \
-        --solanaRPC http://localhost:8899 \
-        --algorandIndexerRPC ws://localhost:8545 \
+        --solanaWS ws://host.docker.internal:8900 \
+        --solanaRPC http://host.docker.internal:8899 \
+        --algorandIndexerRPC ws://host.docker.internal:8545 \
         --algorandIndexerToken "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
         --algorandAlgodToken "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
-        --algorandAlgodRPC https://http://localhost:4001 \
+        --algorandAlgodRPC https://host.docker.internal:4001 \
         --algorandAppID "4"
 else 
-docker run -d --name guardiand --network host --hostname guardian-0 --cap-add=IPC_LOCK --entrypoint /guardiand guardian node \
-        --unsafeDevMode --guardianKey /tmp/bridge.key --publicRPC "[::]:7070" --publicWeb "[::]:7071" --adminSocket /tmp/admin.sock --dataDir /tmp/data \
-        --ethRPC ws://localhost:8545 \
-        --ethContract "0xC89Ce4735882C9F0f0FE26686c53074E09B0D550" \
-        --bscRPC ws://localhost:8546 \
-        --bscContract "0xC89Ce4735882C9F0f0FE26686c53074E09B0D550" \
-        --polygonRPC ws://localhost:8545 \
-        --avalancheRPC ws://localhost:8545 \
-        --auroraRPC ws://localhost:8545 \
-        --fantomRPC ws://localhost:8545 \
-        --oasisRPC ws://localhost:8545 \
-        --karuraRPC ws://localhost:8545 \
-        --acalaRPC ws://localhost:8545 \
-        --klaytnRPC ws://localhost:8545 \
-        --celoRPC ws://localhost:8545 \
-        --moonbeamRPC ws://localhost:8545 \
-        --neonRPC ws://localhost:8545 \
-        --terraWS ws://localhost:8545 \
-        --terra2WS ws://localhost:8545 \
-        --terraLCD https://http://terra-terrad:1317 \
-        --terra2LCD http://localhost:1317  \
-        --terraContract terra18vd8fpwxzck93qlwghaj6arh4p7c5n896xzem5 \
-        --terra2Contract terra18vd8fpwxzck93qlwghaj6arh4p7c5n896xzem5 \
-        --solanaContract Bridge1p5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o \
-        --solanaWS ws://localhost:8900 \
-        --solanaRPC http://localhost:8899 \
-        --algorandIndexerRPC ws://localhost:8545 \
-        --algorandIndexerToken "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
-        --algorandAlgodToken "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
-        --algorandAlgodRPC https://http://localhost:4001 \
-        --algorandAppID "4"
+    docker run -d --name guardiand --network host --hostname guardian-0 --cap-add=IPC_LOCK --entrypoint /guardiand guardian node \
+            --unsafeDevMode --guardianKey /tmp/bridge.key --publicRPC "[::]:7070" --publicWeb "[::]:7071" --adminSocket /tmp/admin.sock --dataDir /tmp/data \
+            --ethRPC ws://localhost:8545 \
+            --ethContract "0xC89Ce4735882C9F0f0FE26686c53074E09B0D550" \
+            --bscRPC ws://localhost:8546 \
+            --bscContract "0xC89Ce4735882C9F0f0FE26686c53074E09B0D550" \
+            --polygonRPC ws://localhost:8545 \
+            --avalancheRPC ws://localhost:8545 \
+            --auroraRPC ws://localhost:8545 \
+            --fantomRPC ws://localhost:8545 \
+            --oasisRPC ws://localhost:8545 \
+            --karuraRPC ws://localhost:8545 \
+            --acalaRPC ws://localhost:8545 \
+            --klaytnRPC ws://localhost:8545 \
+            --celoRPC ws://localhost:8545 \
+            --moonbeamRPC ws://localhost:8545 \
+            --neonRPC ws://localhost:8545 \
+            --terraWS ws://localhost:8545 \
+            --terra2WS ws://localhost:8545 \
+            --terraLCD https://terra-terrad:1317 \
+            --terra2LCD http://localhost:1317  \
+            --terraContract terra18vd8fpwxzck93qlwghaj6arh4p7c5n896xzem5 \
+            --terra2Contract terra18vd8fpwxzck93qlwghaj6arh4p7c5n896xzem5 \
+            --solanaContract Bridge1p5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o \
+            --solanaWS ws://localhost:8900 \
+            --solanaRPC http://localhost:8899 \
+            --algorandIndexerRPC ws://localhost:8545 \
+            --algorandIndexerToken "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
+            --algorandAlgodToken "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
+            --algorandAlgodRPC https://localhost:4001 \
+            --algorandAppID "4"
 fi
+echo "Guardiand Running! To look at logs: \"docker logs guardiand -f\""

projects/evm-messenger/xdapp.config.json

@@ -6,8 +6,10 @@
       "rpc": "http://localhost:8545",
       "privateKey": "0x4f3edf983ac636a65a842ce7c78d9aa706d3b113bce9c46f30d7d21715b23b1d",
       "bridgeAddress": "0xC89Ce4735882C9F0f0FE26686c53074E09B0D550",
-      "deployedAddress": "",
-      "emittedVAAs": []
+      "deployedAddress": "0xf19a2a01b70519f67adb309a994ec8c69a967e8b",
+      "emittedVAAs": [
+        "AQAAAAABAOKdOtGAsVPWjD9EXXXqpi/MmWkJRbqvStBGPpzkTyf3XaPUn3lyKSCqyBuivoD2iIlfF0lC/txAO8TlzjVVt3sAYrn3kQAAAAAAAgAAAAAAAAAAAAAAAPGaKgG3BRn2etswmplOyMaaln6LAAAAAAAAAAABRnJvbTogZXZtMFxuTXNnOiBIZWxsbyBXb3JsZCE="
+      ]
     },
     "evm1": {
       "type": "evm",
@@ -15,8 +17,10 @@
       "rpc": "http://localhost:8546",
       "privateKey": "0x4f3edf983ac636a65a842ce7c78d9aa706d3b113bce9c46f30d7d21715b23b1d",
       "bridgeAddress": "0xC89Ce4735882C9F0f0FE26686c53074E09B0D550",
-      "deployedAddress": "",
-      "emittedVAAs": []
+      "deployedAddress": "0x4cfb3f70bf6a80397c2e634e5bdd85bc0bb189ee",
+      "emittedVAAs": [
+        "AQAAAAABAGdr/ZQbi3Uvn5IlrOV+hvTMcpsTXCw6LXRmH1Tll3QtFtWo5genUwstcmCL20psf/vPH7wB7GSiwKS8DZw5h58AYrn3mwAAAAAABAAAAAAAAAAAAAAAAEz7P3C/aoA5fC5jTlvdhbwLsYnuAAAAAAAAAAABRnJvbTogZXZtMVxuTXNnOiBIZWxsbyBXb3JsZCE="
+      ]
     }
   },
   "wormhole": {