fix: remove abis & use @hyperlane-xyz/core

many-things · Feb 28, 2024 · 58e04ca · 58e04ca
1 parent 477de6e
commit 58e04ca
Show file tree

Hide file tree

Showing 11 changed files with 1,053 additions and 16,748 deletions.
diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
diff --git a/example/abi/HypERC20.ts b/example/abi/HypERC20.ts
diff --git a/example/abi/ITransparentUpgradeableProxy.ts b/example/abi/ITransparentUpgradeableProxy.ts
diff --git a/example/abi/ProxyAdmin.ts b/example/abi/ProxyAdmin.ts
diff --git a/example/abi/StaticMessageIdMultisigIsmFactory.ts b/example/abi/StaticMessageIdMultisigIsmFactory.ts
diff --git a/example/abi/TestRecipient.ts b/example/abi/TestRecipient.ts
diff --git a/example/abi/TransparentUpgradeableProxy.ts b/example/abi/TransparentUpgradeableProxy.ts
diff --git a/example/src/recipient.ts b/example/src/recipient.ts
@@ -1,7 +1,7 @@
-import { Hex } from "viem";
-
-import { TestRecipient } from "../abi/TestRecipient";
-import { StaticMessageIdMultisigIsmFactory } from "../abi/StaticMessageIdMultisigIsmFactory";
+import {
+  TestRecipient__factory,
+  StaticMessageIdMultisigIsmFactory__factory,
+} from "@hyperlane-xyz/core";
 
 import { CONTAINER, Dependencies } from "./ioc";
 import { expectNextContractAddr, logTx } from "./utils";
@@ -24,8 +24,8 @@ async function deployTestRecipient() {
   // deploy test recipient
   {
     const tx = await exec.deployContract({
-      abi: TestRecipient.abi,
-      bytecode: TestRecipient.bytecode.object as Hex,
+      abi: TestRecipient__factory.abi,
+      bytecode: TestRecipient__factory.bytecode,
       args: [],
     });
     logTx("Deploy test recipient", tx);
@@ -34,7 +34,7 @@ async function deployTestRecipient() {
 
   // deploy multisig ism
   const multisigIsmAddr = await query.readContract({
-    abi: StaticMessageIdMultisigIsmFactory.abi,
+    abi: StaticMessageIdMultisigIsmFactory__factory.abi,
     address: HYP_MULTSIG_ISM_FACTORY,
     functionName: "getAddress",
     args: [[account.address], 1],
@@ -43,7 +43,7 @@ async function deployTestRecipient() {
 
   {
     const tx = await exec.writeContract({
-      abi: StaticMessageIdMultisigIsmFactory.abi,
+      abi: StaticMessageIdMultisigIsmFactory__factory.abi,
       address: HYP_MULTSIG_ISM_FACTORY,
       functionName: "deploy",
       args: [[account.address], 1],
@@ -57,7 +57,7 @@ async function deployTestRecipient() {
   console.log(`Setting ism of test recipient to "${multisigIsmAddr.green}"...`);
   {
     const tx = await exec.writeContract({
-      abi: TestRecipient.abi,
+      abi: TestRecipient__factory.abi,
       address: testRecipientAddr,
       functionName: "setInterchainSecurityModule",
       args: [multisigIsmAddr],

diff --git a/example/src/warp.ts b/example/src/warp.ts
@@ -1,7 +1,7 @@
 import { Command } from "commander";
-import { Hex, isAddress, parseEther } from "viem";
+import { isAddress } from "viem";
 
-import { HypERC20 } from "../abi/HypERC20";
+import { HypERC20__factory } from "@hyperlane-xyz/core";
 
 import { HYP_MAILBOX } from "./constants";
 import { CONTAINER, Dependencies } from "./ioc";
@@ -43,8 +43,8 @@ async function deployWarpRoute() {
 
   {
     const tx = await exec.deployContract({
-      abi: HypERC20.abi,
-      bytecode: HypERC20.bytecode.object as Hex,
+      abi: HypERC20__factory.abi,
+      bytecode: HypERC20__factory.bytecode,
       args: [6, HYP_MAILBOX],
     });
     logTx("Deploying HypERC20Osmo", tx);
@@ -53,7 +53,7 @@ async function deployWarpRoute() {
 
   {
     const tx = await exec.writeContract({
-      abi: HypERC20.abi,
+      abi: HypERC20__factory.abi,
       address: hypErc20OsmoAddr,
       functionName: "initialize",
       args: [0n, "Hyperlane Bridged Osmosis", "OSMO"],
@@ -77,7 +77,7 @@ async function linkWarpRoute(warp: string, domain: string, route: string) {
   if (!isAddress(warp)) throw new Error("Invalid warp address");
 
   const tx = await exec.writeContract({
-    abi: HypERC20.abi,
+    abi: HypERC20__factory.abi,
     address: warp,
     functionName: "enrollRemoteRouter",
     args: [parseInt(domain), `0x${extractByte32AddrFromBech32(route)}`],
@@ -94,7 +94,7 @@ async function transferWarpRoute(warp: string, domain: string, to: string) {
   if (!isAddress(warp)) throw new Error("Invalid warp address");
 
   const tx = await exec.writeContract({
-    abi: HypERC20.abi,
+    abi: HypERC20__factory.abi,
     address: warp,
     functionName: "transferRemote",
     args: [

diff --git a/package.json b/package.json
@@ -22,6 +22,7 @@
     "@cosmjs/proto-signing": "^0.32.2",
     "@cosmjs/stargate": "^0.32.2",
     "@cosmjs/tendermint-rpc": "^0.32.2",
+    "@hyperlane-xyz/core": "^3.7.0",
     "axios": "^1.6.7",
     "colors": "^1.4.0",
     "commander": "^11.1.0",