Initial replacement of certusone with sdkv2

examples/advanced/package.json

@@ -14,7 +14,7 @@
     "testnet-spy": "docker run --platform=linux/amd64 -p 7073:7073 --entrypoint /guardiand ghcr.io/wormhole-foundation/guardiand:latest spy --nodeKey /node.key --spyRPC \"[::]:7073\" --network /wormhole/testnet/2/1 --bootstrap '/dns4/t-guardian-01.nodes.stable.io/udp/8999/quic/p2p/12D3KooWCW3LGUtkCVkHZmVSZHzL3C4WRKWfqAiJPz1NR7dT9Bxh,/dns4/t-guardian-02.nodes.stable.io/udp/8999/quic/p2p/12D3KooWJXA6goBCiWM8ucjzc4jVUBSqL9Rri6UpjHbkMPErz5zK'"
   },
   "dependencies": {
-    "@certusone/wormhole-sdk": "^0.9.11",
+    "@wormhole-foundation/sdk": "0.7.0-beta.7",
     "@mysten/sui.js": "^0.32.1",
     "@wormhole-foundation/relayer-engine": "file:../../",
     "koa": "^2.14.1",

examples/advanced/src/app.ts

@@ -19,10 +19,10 @@ import {
   onJobHandler,
   RedisStorage,
 } from "@wormhole-foundation/relayer-engine";
-import { CHAIN_ID_SOLANA, SignedVaa } from "@certusone/wormhole-sdk";
 import { rootLogger } from "./log.js";
 import { Controller } from "./controller.js";
 import { Logger } from "winston";
+import { toChainId } from "@wormhole-foundation/sdk";
 
 export class TestStorage extends RedisStorage {
   startWorker(cb: onJobHandler): void {
@@ -33,7 +33,7 @@ export class TestStorage extends RedisStorage {
   async stopWorker(): Promise<void> {
     return;
   }
-  async addVaaToQueue(vaa: SignedVaa): Promise<RelayJob> {
+  async addVaaToQueue(vaa: Uint8Array): Promise<RelayJob> {
     console.log("adding vaa to queue: ", vaa);
     return {} as RelayJob;
   }
@@ -67,7 +67,7 @@ async function main(namespace: string) {
   app.use(sourceTx());
 
   app
-    .chain(CHAIN_ID_SOLANA)
+    .chain(toChainId("Solana"))
     .address(
       "DZnkkTmCiFWfYTfT41X3Rd1kDgozqzxWaHqsw6W4x2oe",
       fundsCtrl.redeemVaa

examples/advanced/src/controller.ts

@@ -1,36 +1,41 @@
 import { Next } from "@wormhole-foundation/relayer-engine";
-import { TokenBridgePayload } from "@certusone/wormhole-sdk";
 import { MyRelayerContext } from "./app.js";
+import { TokenBridge, canonicalAddress } from "@wormhole-foundation/sdk";
 
 export class Controller {
   redeemVaa = async (ctx: MyRelayerContext, next: Next) => {
     let seq = ctx.vaa!.sequence.toString();
     ctx.logger.info(`chain middleware - ${seq} - ${ctx.sourceTxHash}`);
 
-    const { payload } = ctx.tokenBridge;
+    const { vaa } = ctx.tokenBridge;
 
     // only care about transfers
-    switch (payload?.payloadType) {
-      case TokenBridgePayload.Transfer:
+    switch (vaa.payloadLiteral) {
+      case "TokenBridge:Transfer":
         ctx.logger.info(
           `Transfer processing for: \n` +
-            `\tToken: ${payload.tokenChain}:${payload.tokenAddress.toString(
-              "hex"
+            `\tToken: ${vaa.payload.token.chain}:${canonicalAddress(
+              vaa.payload.token
             )}\n` +
-            `\tAmount: ${payload.amount}\n` +
-            `\tReceiver: ${payload.toChain}:${payload.to.toString("hex")}\n`
+            `\tAmount: ${vaa.payload.token.amount}\n` +
+            `\tReceiver: ${vaa.payload.to.chain}:${canonicalAddress(
+              vaa.payload.to
+            )}\n`
         );
         break;
-      case TokenBridgePayload.TransferWithPayload:
+      case "TokenBridge:TransferWithPayload":
+        const { payload } = vaa as TokenBridge.VAA<"TransferWithPayload">;
         ctx.logger.info(
           `Transfer processing for: \n` +
-            `\tToken: ${payload.tokenChain}:${payload.tokenAddress.toString(
-              "hex"
+            `\tToken: ${payload.token.chain}:${canonicalAddress(
+              payload.token
             )}\n` +
-            `\tAmount: ${payload.amount}\n` +
-            `\tSender ${payload.fromAddress?.toString("hex")}\n` +
-            `\tReceiver: ${payload.toChain}:${payload.to.toString("hex")}\n` +
-            `\tPayload: ${payload.tokenTransferPayload.toString("hex")}\n`
+            `\tAmount: ${payload.token.amount}\n` +
+            `\tSender ${payload.from.toString()}\n` +
+            `\tReceiver: ${payload.to.chain}:${canonicalAddress(
+              payload.to
+            )}\n` +
+            `\tPayload: ${payload.payload}\n`
         );
         break;
     }