SDK: Remove certusone dependency (#131)

Author: barnjamin

evm/package.json

@@ -13,12 +13,11 @@
     "generate": "typechain --target=ethers-v5 --out-dir=ts/src/types out/*/*.json"
   },
   "dependencies": {
-    "@certusone/wormhole-sdk": "^0.10.10",
+    "@wormhole-foundation/sdk":"^0.6.8-beta.0",
     "ethers": "^5.7.2"
   },
   "devDependencies": {
     "envfile": "^6.18.0",
-    "@certusone/wormhole-sdk": "^0.10.10",
     "@typechain/ethers-v5": "^10.2.0",
     "@types/chai": "^4.3.4",
     "@types/mocha": "^10.0.1",

evm/ts/scripts/set_fast_transfer_parameters.ts

@@ -1,8 +1,8 @@
 import { getConfig } from "./helpers";
-import { coalesceChainId, tryHexToNativeString } from "@certusone/wormhole-sdk";
 import { ITokenRouter__factory } from "../src/types/factories/ITokenRouter__factory";
 import { ITokenRouter, FastTransferParametersStruct } from "../src/types/ITokenRouter";
 import { ethers } from "ethers";
+import { Chain, toChainId, toNative } from "@wormhole-foundation/sdk";
 
 export function getArgs() {
     const argv = require("yargs")
@@ -26,7 +26,7 @@ export function getArgs() {
 async function setFastTransferParams(
     chainId: string,
     tokenRouter: ITokenRouter,
-    params: FastTransferParametersStruct
+    params: FastTransferParametersStruct,
 ): Promise<void> {
     console.log(`Updating fast transfer parameters`);
     const tx = await tokenRouter.updateFastTransferParameters(params);
@@ -52,14 +52,12 @@ async function main() {
     const provider = new ethers.providers.StaticJsonRpcProvider(rpc);
     const wallet = new ethers.Wallet(key, provider);
 
-    const routerChainId = coalesceChainId(chain);
+    const routerChainId = toChainId(chain);
 
     // Setup token router contract.
     const tokenRouter = ITokenRouter__factory.connect(
-        ethers.utils.getAddress(
-            tryHexToNativeString(routers[routerChainId].address.substring(2), routerChainId)
-        ),
-        wallet
+        toNative(chain as Chain, routers[routerChainId].address).toString(),
+        wallet,
     );
 
     await setFastTransferParams(routerChainId.toString(), tokenRouter, fastTransferParams);

evm/ts/scripts/setup_matching_engine.ts

@@ -1,8 +1,8 @@
 import { getConfig, ZERO_BYTES32 } from "./helpers";
-import { ChainId, coalesceChainId, tryHexToNativeString } from "@certusone/wormhole-sdk";
 import { IMatchingEngine__factory, IMatchingEngine } from "../src/types/";
 import { RouterEndpointStruct } from "../src/types/IMatchingEngine";
 import { ethers } from "ethers";
+import { ChainId, toChain, toChainId, toNative } from "@wormhole-foundation/sdk";
 
 export function getArgs() {
     const argv = require("yargs")
@@ -27,7 +27,7 @@ async function addRouterInfo(
     chainId: string,
     engine: IMatchingEngine,
     routerEndpoint: RouterEndpointStruct,
-    domain: string
+    domain: string,
 ): Promise<void> {
     console.log(`Adding router endpoint for chain ${chainId}`);
     const tx = await engine.addRouterEndpoint(chainId, routerEndpoint, domain);
@@ -64,19 +64,16 @@ async function main() {
     const provider = new ethers.providers.StaticJsonRpcProvider(rpc);
     const wallet = new ethers.Wallet(key, provider);
 
-    const engineChainId = coalesceChainId(chain);
+    const engineChainId = toChainId(chain);
     if (engineChainId != (matchingEngineConfig.chain as ChainId)) {
         console.log(engineChainId, matchingEngineConfig.chainId);
         throw Error("Invalid chainId");
     }
 
+    const engineChain = toChain(engineChainId);
+    const engineAddress = toNative(engineChain, matchingEngineConfig["address"]);
     // Setup token router contract.
-    const engine = IMatchingEngine__factory.connect(
-        ethers.utils.getAddress(
-            tryHexToNativeString(matchingEngineConfig["address"].substring(2), engineChainId)
-        ),
-        wallet
-    );
+    const engine = IMatchingEngine__factory.connect(engineAddress.toString(), wallet);
 
     // Set CCTP allowance.
     await setCctpAllowance(engine);
@@ -92,7 +89,7 @@ async function main() {
             chainId,
             engine,
             { router: targetRouter.address, mintRecipient: targetRouter.mintRecipient },
-            targetRouter.domain
+            targetRouter.domain,
         );
     }
 }

evm/ts/scripts/setup_token_router.ts

@@ -1,9 +1,9 @@
 import { getConfig, ZERO_BYTES32 } from "./helpers";
-import { coalesceChainId, tryHexToNativeString } from "@certusone/wormhole-sdk";
 import { ITokenRouter__factory } from "../src/types/factories/ITokenRouter__factory";
 import { ITokenRouter } from "../src/types/ITokenRouter";
 import { EndpointStruct } from "../src/types/ITokenRouter";
 import { ethers } from "ethers";
+import { toChain, toChainId, toNative } from "@wormhole-foundation/sdk";
 
 export function getArgs() {
     const argv = require("yargs")
@@ -28,7 +28,7 @@ async function addRouterInfo(
     chainId: string,
     tokenRouter: ITokenRouter,
     routerEndpoint: EndpointStruct,
-    domain: string
+    domain: string,
 ): Promise<void> {
     console.log(`Adding router endpoint for chain ${chainId}`);
     const tx = await tokenRouter.addRouterEndpoint(chainId, routerEndpoint, domain);
@@ -64,15 +64,12 @@ async function main() {
     const provider = new ethers.providers.StaticJsonRpcProvider(rpc);
     const wallet = new ethers.Wallet(key, provider);
 
-    const routerChainId = coalesceChainId(chain);
+    const routerChainId = toChainId(chain);
+    const routerChain = toChain(routerChainId);
+    const routerAddress = toNative(routerChain, routers[routerChainId].address);
 
     // Setup token router contract.
-    const tokenRouter = ITokenRouter__factory.connect(
-        ethers.utils.getAddress(
-            tryHexToNativeString(routers[routerChainId].address.substring(2), routerChainId)
-        ),
-        wallet
-    );
+    const tokenRouter = ITokenRouter__factory.connect(routerAddress.toString(), wallet);
 
     // Set CCTP allowance.
     await setCctpAllowance(tokenRouter);
@@ -91,7 +88,7 @@ async function main() {
             chainId,
             tokenRouter,
             { router: targetRouter.address, mintRecipient: targetRouter.mintRecipient },
-            targetRouter.domain
+            targetRouter.domain,
         );
     }
 }

evm/ts/src/MatchingEngine/evm.ts

@@ -1,4 +1,4 @@
-import { ChainId } from "@certusone/wormhole-sdk";
+import { ChainId } from "@wormhole-foundation/sdk";
 import { ethers } from "ethers";
 import { RouterEndpoint, LiveAuctionData, MatchingEngine, RedeemParameters } from ".";
 import { LiquidityLayerTransactionResult } from "..";
@@ -25,7 +25,7 @@ export class EvmMatchingEngine implements MatchingEngine<ethers.ContractTransact
     constructor(
         connection: ethers.Signer | ethers.providers.Provider,
         contractAddress: string,
-        circleBridge: string
+        circleBridge: string,
     ) {
         this.contract = IMatchingEngine__factory.connect(contractAddress, connection);
         this.circle = ITokenMessenger__factory.connect(circleBridge, connection);
@@ -54,42 +54,42 @@ export class EvmMatchingEngine implements MatchingEngine<ethers.ContractTransact
     async addRouterEndpoint(
         chain: number,
         endpoint: RouterEndpoint,
-        domain: number
+        domain: number,
     ): Promise<ethers.ContractTransaction> {
         return this.contract.addRouterEndpoint(chain, endpoint, domain);
     }
 
     async placeInitialBid(
         fastTransferVaa: Buffer | Uint8Array,
-        feeBid: bigint | ethers.BigNumberish
+        feeBid: bigint | ethers.BigNumberish,
     ): Promise<ethers.ContractTransaction> {
         return this.contract.placeInitialBid(fastTransferVaa, feeBid);
     }
 
     async improveBid(
         auctionId: Buffer | Uint8Array,
-        feeBid: bigint | ethers.BigNumberish
+        feeBid: bigint | ethers.BigNumberish,
     ): Promise<ethers.ContractTransaction> {
         return this.contract.improveBid(auctionId, feeBid);
     }
 
     async executeFastOrder(
-        fastTransferVaa: Buffer | Uint8Array
+        fastTransferVaa: Buffer | Uint8Array,
     ): Promise<ethers.ContractTransaction> {
         return this.contract.executeFastOrder(fastTransferVaa);
     }
 
     async executeSlowOrderAndRedeem(
         fastTransferVaa: Buffer | Uint8Array,
-        params: RedeemParameters
+        params: RedeemParameters,
     ): Promise<ethers.ContractTransaction> {
         return this.contract.executeSlowOrderAndRedeem(fastTransferVaa, params);
     }
 
     async calculateDynamicPenalty(
         auctionId?: Buffer | Uint8Array,
         amount?: bigint | ethers.BigNumberish,
-        blocksElapsed?: bigint | ethers.BigNumberish
+        blocksElapsed?: bigint | ethers.BigNumberish,
     ): Promise<[ethers.BigNumberish, ethers.BigNumberish]> {
         if (auctionId !== undefined) {
             return this.contract["calculateDynamicPenalty(bytes32)"](auctionId);
@@ -144,8 +144,8 @@ export class EvmMatchingEngine implements MatchingEngine<ethers.ContractTransact
                     this.address,
                     coreBridge.address,
                     txReceipt,
-                    circleTransmitterAddress
-                )
+                    circleTransmitterAddress,
+                ),
             );
     }
 

evm/ts/src/TokenRouter/evm.ts

@@ -1,4 +1,4 @@
-import { ChainId } from "@certusone/wormhole-sdk";
+import { ChainId } from "@wormhole-foundation/sdk";
 import { ethers } from "ethers";
 import { Endpoint, OrderResponse, TokenRouter, FastTransferParameters } from ".";
 import { LiquidityLayerTransactionResult } from "..";
@@ -25,7 +25,7 @@ export class EvmTokenRouter implements TokenRouter<ethers.ContractTransaction> {
     constructor(
         connection: ethers.Signer | ethers.providers.Provider,
         contractAddress: string,
-        circleBridge: string
+        circleBridge: string,
     ) {
         this.contract = ITokenRouter__factory.connect(contractAddress, connection);
         this.circle = ITokenMessenger__factory.connect(circleBridge, connection);
@@ -41,7 +41,7 @@ export class EvmTokenRouter implements TokenRouter<ethers.ContractTransaction> {
         redeemer: Buffer | Uint8Array,
         redeemerMessage: Buffer | Uint8Array,
         minAmountOut?: bigint,
-        refundAddress?: string
+        refundAddress?: string,
     ) {
         if (minAmountOut !== undefined && refundAddress !== undefined) {
             return this.contract["placeMarketOrder(uint64,uint64,uint16,bytes32,bytes,address)"](
@@ -50,14 +50,14 @@ export class EvmTokenRouter implements TokenRouter<ethers.ContractTransaction> {
                 targetChain,
                 redeemer,
                 redeemerMessage,
-                refundAddress
+                refundAddress,
             );
         } else {
             return this.contract["placeMarketOrder(uint64,uint16,bytes32,bytes)"](
                 amountIn,
                 targetChain,
                 redeemer,
-                redeemerMessage
+                redeemerMessage,
             );
         }
     }
@@ -70,7 +70,7 @@ export class EvmTokenRouter implements TokenRouter<ethers.ContractTransaction> {
         maxFee: bigint,
         deadline: number,
         minAmountOut?: bigint,
-        refundAddress?: string
+        refundAddress?: string,
     ) {
         if (minAmountOut !== undefined && refundAddress !== undefined) {
             return this.contract[
@@ -83,7 +83,7 @@ export class EvmTokenRouter implements TokenRouter<ethers.ContractTransaction> {
                 redeemerMessage,
                 refundAddress,
                 maxFee,
-                deadline
+                deadline,
             );
         } else {
             return this.contract["placeFastMarketOrder(uint64,uint16,bytes32,bytes,uint64,uint32)"](
@@ -92,7 +92,7 @@ export class EvmTokenRouter implements TokenRouter<ethers.ContractTransaction> {
                 redeemer,
                 redeemerMessage,
                 maxFee,
-                deadline
+                deadline,
             );
         }
     }
@@ -133,8 +133,8 @@ export class EvmTokenRouter implements TokenRouter<ethers.ContractTransaction> {
                     this.address,
                     coreBridge.address,
                     txReceipt,
-                    circleTransmitterAddress
-                )
+                    circleTransmitterAddress,
+                ),
             );
     }
 

evm/ts/src/messages.ts

@@ -1,4 +1,3 @@
-import { parseVaa as _parseVaa } from "@certusone/wormhole-sdk";
 import { ethers } from "ethers";
 
 export const CCTP_DEPOSIT_PAYLOAD = 1;
@@ -19,7 +18,7 @@ export class WormholeCctpDepositHeader {
         targetDomain: number,
         nonce: bigint,
         fromAddress: Uint8Array,
-        mintRecipient: Uint8Array
+        mintRecipient: Uint8Array,
     ) {
         this.token = token;
         this.amount = amount;
@@ -57,7 +56,7 @@ export class WormholeCctpDepositHeader {
                 targetDomain,
                 nonce,
                 fromAddress,
-                mintRecipient
+                mintRecipient,
             ),
             payload,
         ];
@@ -108,7 +107,7 @@ export class MessageDecoder {
 
     decodeCoreBridgeMessage(
         emitterAddress: Buffer | Uint8Array,
-        messagePayload: Buffer | Uint8Array
+        messagePayload: Buffer | Uint8Array,
     ) {
         const emitter = Buffer.from(emitterAddress);
         const payload = Buffer.from(messagePayload);
@@ -119,17 +118,8 @@ export class MessageDecoder {
         }
     }
 
-    parseVaa(encodedVaa: Buffer) {
-        const vaa = _parseVaa(encodedVaa);
-
-        return {
-            vaa,
-            decoded: this.decodeCoreBridgeMessage(vaa.emitterAddress, vaa.payload),
-        };
-    }
-
     static unsafeDecodeWormholeCctpPayload(
-        wormholeCctpMessage: Buffer
+        wormholeCctpMessage: Buffer,
     ): CoreBridgeLiquidityLayerMessage {
         const [wormholeCctp, payload] =
             WormholeCctpDepositHeader.decodeCoreBridgeMessage(wormholeCctpMessage);
@@ -158,7 +148,7 @@ export class Fill {
         sourceChain: number,
         orderSender: Buffer,
         redeemer: Buffer,
-        redeemerMessage: Buffer
+        redeemerMessage: Buffer,
     ) {
         this.sourceChain = sourceChain;
         this.orderSender = orderSender;
@@ -195,7 +185,7 @@ export class FastFill {
         orderSender: Buffer,
         redeemer: Buffer,
         redeemerMessage: Buffer,
-        fillAmount: bigint
+        fillAmount: bigint,
     ) {
         this.sourceChain = sourceChain;
         this.orderSender = orderSender;
@@ -245,7 +235,7 @@ export class FastMarketOrder {
         maxFee: bigint,
         initAuctionFee: bigint,
         deadline: number,
-        redeemerMessage: Buffer
+        redeemerMessage: Buffer,
     ) {
         this.amountIn = amountIn;
         this.minAmountOut = minAmountOut;
@@ -287,7 +277,7 @@ export class FastMarketOrder {
             maxFee,
             initAuctionFee,
             deadline,
-            redeemerMessage
+            redeemerMessage,
         );
     }
 }