fix: trouble shooting (#118)

* feat: add signer alias to multisig ism config * fix: correct example config * fix: save agent config * fix: remove existing deployment * fix: error message * fix: use hex addr * fix: with initial isms * fix: again * fix: revert & use address only * fix: new agent config definition * fix: new docker agent image * fix: add cw-hpl-exp * fix: query or 0 * revert bump image version * done
many-things · Mar 8, 2024 · ae3dc92 · ae3dc92
1 parent 543708c
commit ae3dc92
Show file tree

Hide file tree

Showing 10 changed files with 67 additions and 161 deletions.
diff --git a/DEPLOYMENT.md b/DEPLOYMENT.md
@@ -53,19 +53,36 @@ signer: '<private-key> or <mnemonic>'
 
 deploy:
   ism:
-    - 11155111
+    type: routing
+    owner: <signer>
+    isms:
+      - type: multisig
+        owner: <signer>
+        validators:
+          11155111:
+            addrs:
+              - <signer>
+            threshold: 1
 
   hooks:
     default:
-      type: mock
-
-    required:
       type: aggregate
-      # if you keep it as "<signer>", the script will identify this as deployer address
       owner: <signer>
       hooks:
         - type: merkle
 
+        - type: igp
+          owner: <signer>
+          configs:
+            11155111:
+              exchange_rate: 3000
+              gas_price: 5000
+          default_gas_usage: 30000
+
+    required:
+      type: aggregate
+      owner: <signer>
+      hooks:
         - type: pausable
           owner: <signer>
           paused: false
@@ -76,14 +93,6 @@ deploy:
             # if you didn't set the denom, it will be set as gas denom of network config
             denom: uosmo
             amount: 1
-
-        - type: igp
-          owner: <signer>
-          configs:
-            11155111:
-              exchange_rate: 3000
-              gas_price: 5000
-          default_gas_usage: 30000
 ```
 
 ## 2. Upload Contract Codes
@@ -146,8 +155,10 @@ Replace every `{sepolia_private_key}` and `{osmosis_private_key}` from files bel
 And run with below command.
 
 ```bash
+cd ./example
+
 # Merge osmo-test-5.config.json and agent-config.docker.json
-OSMOSIS_TESTNET_AGENT_CONFIG=$(cat ../context/osmo-test-5.config.json) && \
+OSMOSIS_TESTNET_AGENT_CONFIG=$(cat ../context/osmo-test-5.config.json | jq -r '.chains.osmotest5') && \
   OSMOSIS_TESTNET_AGENT_CONFIG_NAME=$(echo $OSMOSIS_TESTNET_AGENT_CONFIG | jq -r '.name') && \
     cat ./hyperlane/agent-config.docker.json \
       | jq ".chains.$OSMOSIS_TESTNET_AGENT_CONFIG_NAME=$(echo $OSMOSIS_TESTNET_AGENT_CONFIG)" > merge.tmp && \
@@ -206,7 +217,7 @@ yarn cw-hpl-exp warp deploy --pk 'YOUR_PRIVATE_KEY'
 { "hypErc20Osmo": "0x..." }
 
 # deploy warp route on osmo-test-5
-yarn cw-hpl warp deploy create ./warp/uosmo.json -n osmo-test-5
+yarn cw-hpl warp create ./example/warp/uosmo.json -n osmo-test-5
 
 # register osmo-test-5 warp route to sepolia warp route
 yarn cw-hpl-exp warp link $hypErc20Osmo 1037 $OSMOSIS_WARP_ROUTE_ADDRESS --pk 'YOUR_PRIVATE_KEY'

diff --git a/config.example.yaml b/config.example.yaml
@@ -1,46 +1,41 @@
 networks:
-  - id: "localwasmd"
-    hrp: "uwasm"
+  - id: 'localwasmd'
+    hrp: 'uwasm'
     endpoint:
-      rpc: "http://localhost:26657"
-      rest: "http://localhost:1317"
-      grpc: "http://localhost:9090"
+      rpc: 'http://localhost:26657'
+      rest: 'http://localhost:1317'
+      grpc: 'http://localhost:9090'
     gas:
-      price: "0.025"
-      denom: "uwasm"
+      price: '0.025'
+      denom: 'uwasm'
     domain: 1063 # localwasmd -> ascii / decimal -> sum
 
-  - id: "localosmosis"
-    hrp: "osmo"
+  - id: 'localosmosis'
+    hrp: 'osmo'
     endpoint:
-      rpc: "http://localhost:26657"
-      rest: "http://localhost:1317"
-      grpc: "http://localhost:9090"
+      rpc: 'http://localhost:26657'
+      rest: 'http://localhost:1317'
+      grpc: 'http://localhost:9090'
     gas:
-      price: "0.025"
-      denom: "uosmo"
+      price: '0.025'
+      denom: 'uosmo'
     domain: 1304 # localosmosis -> ascii / decimal -> sum
 
-  - id: "localneutron"
-    hrp: "neutron"
+  - id: 'localneutron'
+    hrp: 'neutron'
     endpoint:
-      rpc: "http://localhost:26657"
-      rest: "http://localhost:1317"
-      grpc: "http://localhost:9090"
+      rpc: 'http://localhost:26657'
+      rest: 'http://localhost:1317'
+      grpc: 'http://localhost:9090'
     gas:
-      price: "0.025"
-      denom: "untrn"
+      price: '0.025'
+      denom: 'untrn'
     domain: 1302
 
 signer: deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef
 
 deploy:
   ism:
-    # # hpl_ism_multisig with default validator setup (signer = validator, threshold = 1)
-    # - 5
-    # - 420
-    # - 421613
-
     # # hpl_ism_multisig
     # type: multisig
     # owner: <signer>

diff --git a/context/.gitkeep b/context/.gitkeep
diff --git a/context/osmo-test-5.json b/context/osmo-test-5.json
diff --git a/example/docker-compose.yml b/example/docker-compose.yml
@@ -2,6 +2,7 @@ version: '2'
 services:
   relayer:
     container_name: hpl-relayer
+    # image: gcr.io/abacus-labs-dev/hyperlane-agent:9736164-20240307-131918
     image: gcr.io/abacus-labs-dev/hyperlane-agent:3bb4d87-20240129-164519
     user: root
     # restart: always
@@ -21,6 +22,7 @@ services:
 
   validator-sepolia:
     container_name: hpl-validator-sepolia
+    # image: gcr.io/abacus-labs-dev/hyperlane-agent:9736164-20240307-131918
     image: gcr.io/abacus-labs-dev/hyperlane-agent:3bb4d87-20240129-164519
     user: root
     # restart: always
@@ -40,6 +42,7 @@ services:
 
   validator-osmotest5:
     container_name: hpl-validator-osmotest5
+    # image: gcr.io/abacus-labs-dev/hyperlane-agent:9736164-20240307-131918
     image: gcr.io/abacus-labs-dev/hyperlane-agent:3bb4d87-20240129-164519
     user: root
     # restart: always

diff --git a/package.json b/package.json
@@ -11,6 +11,7 @@
     "build": "yarn clean && esbuild ./script --bundle --outfile=./dist/index.js --platform=node",
     "start": "yarn build && node ./dist/index.js",
     "cw-hpl": "yarn start",
+    "cw-hpl-exp": "tsx ./example",
     "dev": "tsx ./script"
   },
   "keywords": [],

diff --git a/script/commands/deploy.ts b/script/commands/deploy.ts
@@ -1,13 +1,9 @@
 import { Command } from 'commander';
 
 import { deployHook, deployIsm } from '../deploy';
+import { saveAgentConfig } from '../shared/agent';
 import { Client, config, getNetwork } from '../shared/config';
-import {
-  Context,
-  ContextDeployments,
-  saveAgentConfig,
-  saveContext,
-} from '../shared/context';
+import { Context, ContextDeployments, saveContext } from '../shared/context';
 import { deployContract, executeMultiMsg } from '../shared/contract';
 import { CONTAINER, Dependencies } from '../shared/ioc';
 

diff --git a/script/deploy/ism.ts b/script/deploy/ism.ts
@@ -1,10 +1,6 @@
 import { Client, IsmType } from '../shared/config';
 import { Context, ContextIsm } from '../shared/context';
-import {
-  deployContract,
-  executeContract,
-  executeMultiMsg,
-} from '../shared/contract';
+import { deployContract, executeMultiMsg } from '../shared/contract';
 
 const deployRoutingIsm = async (
   ctx: Context,
@@ -21,17 +17,10 @@ const deployRoutingIsm = async (
 
   const routing = await deployContract(ctx, client, 'hpl_ism_routing', {
     owner: ism.owner === '<signer>' ? client.signer : ism.owner,
-  });
-
-  await executeContract(client, routing, {
-    router: {
-      set_routes: {
-        set: routes.map(({ domain, route }) => ({
-          domain,
-          route: route.address,
-        })),
-      },
-    },
+    isms: routes.map(({ domain, route }) => ({
+      domain,
+      address: route.address,
+    })),
   });
 
   return {
@@ -61,7 +50,9 @@ export async function deployIsm(
               set_validators: {
                 domain: Number(domain),
                 threshold,
-                validators: addrs,
+                validators: addrs.map((v) =>
+                  v === '<signer>' ? client.signer_addr : v,
+                ),
               },
             },
           }),

diff --git a/script/shared/agent.ts b/script/shared/agent.ts
@@ -56,8 +56,11 @@ export async function fromContext(
         index: {
           from:
             // sub 1 block to make sure we don't miss any block
-            parseInt(mailboxContractInfo.contract_info.created.block_height) -
-            1,
+            mailboxContractInfo
+              ? parseInt(
+                  mailboxContractInfo.contract_info.created.block_height,
+                ) - 1
+              : undefined,
           chunk: 10_000,
         },
         blocks: {

diff --git a/script/shared/context.ts b/script/shared/context.ts
@@ -77,11 +77,7 @@ export function loadContext(
     const result = fs.readFileSync(fileName, 'utf-8');
     return JSON.parse(result.toString()) as Context;
   } catch (err) {
-    console.error(
-      'Failed to load context. Returning an empty context object.',
-      'err:',
-      err,
-    );
+    console.error('Failed to load context. Returning an empty context object.');
   }
 
   return {