From 6e856f6cad3352ba8bef9778a032fb40204d76d5 Mon Sep 17 00:00:00 2001
From: Ben Guidarelli <ben.guidarelli@gmail.com>
Date: Mon, 8 Jul 2024 12:53:20 -0400
Subject: [PATCH 1/3] sdk: update version script to set peer dep versions

---
 setSdkVersion.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/setSdkVersion.ts b/setSdkVersion.ts
index 893f7b623..cc25be52a 100644
--- a/setSdkVersion.ts
+++ b/setSdkVersion.ts
@@ -20,6 +20,15 @@ function updateVersionInPackageJson(
     );
   }
 
+  if (packageJson.peerDependencies) {
+    packageJson.peerDependencies = Object.fromEntries(
+      Object.entries(packageJson.peerDependencies).map((entry) => {
+        const [k, v] = entry as [string, string];
+        return [k, packagesInWorkspace.includes(k) ? `${version}` : v];
+      })
+    );
+  }
+
   fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
 }
 

From ddf2763be0041360dc06ec0ed0b31a9386dcbc89 Mon Sep 17 00:00:00 2001
From: Ben Guidarelli <ben.guidarelli@gmail.com>
Date: Mon, 8 Jul 2024 13:04:14 -0400
Subject: [PATCH 2/3] fix tests with latest sdk

---
 sdk/route/__tests__/route.test.ts | 12 +++---------
 sdk/route/src/manual.ts           |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/sdk/route/__tests__/route.test.ts b/sdk/route/__tests__/route.test.ts
index 3385c4b6a..f3a3e1d04 100644
--- a/sdk/route/__tests__/route.test.ts
+++ b/sdk/route/__tests__/route.test.ts
@@ -5,17 +5,15 @@ import {
   routes,
 } from "@wormhole-foundation/sdk-connect";
 
-import * as testing from "@wormhole-foundation/sdk-definitions/testing";
-
 import "@wormhole-foundation/sdk-definitions-ntt";
 import "@wormhole-foundation/sdk-evm-ntt";
 import "@wormhole-foundation/sdk-solana-ntt";
 
 import { EvmPlatform } from "@wormhole-foundation/sdk-evm";
 import { SolanaPlatform } from "@wormhole-foundation/sdk-solana";
+import { nttAutomaticRoute } from "../src/automatic.js";
 import { nttManualRoute } from "../src/manual.js";
 import { NttRoute } from "../src/types.js";
-import { nttAutomaticRoute } from "../src/automatic.js";
 
 const SOL_TOKEN = "EetppHswYvV1jjRWoQKC1hejdeBDHR9NNzNtCyRQfrrQ";
 const SEPOLIA_TOKEN = "0x738141EFf659625F2eAD4feECDfCD94155C67f18";
@@ -92,14 +90,12 @@ describe("Manual Route Tests", function () {
   let found: routes.ManualRoute<Network>;
   it("Should resolve a given route request", async function () {
     const request = await routes.RouteTransferRequest.create(wh, {
-      from: testing.utils.makeChainAddress("Solana"),
-      to: testing.utils.makeChainAddress("Sepolia"),
       source: Wormhole.tokenId("Solana", SOL_TOKEN),
       destination: Wormhole.tokenId("Sepolia", SEPOLIA_TOKEN),
     });
     const foundRoutes = await resolver.findRoutes(request);
     expect(foundRoutes).toHaveLength(1);
-    expect(foundRoutes[0]!.request.from.chain).toEqual("Solana");
+    expect(foundRoutes[0]!.request.fromChain.chain).toEqual("Solana");
 
     const rt = foundRoutes[0]!;
     if (!routes.isManual(rt)) throw new Error("Expected manual route");
@@ -185,14 +181,12 @@ describe("Automatic Route Tests", function () {
   let found: routes.AutomaticRoute<Network>;
   it("Should resolve a given route request", async function () {
     const request = await routes.RouteTransferRequest.create(wh, {
-      from: testing.utils.makeChainAddress("Solana"),
-      to: testing.utils.makeChainAddress("Sepolia"),
       source: Wormhole.tokenId("Solana", SOL_TOKEN),
       destination: Wormhole.tokenId("Sepolia", SEPOLIA_TOKEN),
     });
     const foundRoutes = await resolver.findRoutes(request);
     expect(foundRoutes).toHaveLength(1);
-    expect(foundRoutes[0]!.request.from.chain).toEqual("Solana");
+    expect(foundRoutes[0]!.request.fromChain.chain).toEqual("Solana");
 
     const rt = foundRoutes[0]!;
     if (!routes.isAutomatic(rt)) throw new Error("Expected automatic route");
diff --git a/sdk/route/src/manual.ts b/sdk/route/src/manual.ts
index 0e88b642f..5afe012c0 100644
--- a/sdk/route/src/manual.ts
+++ b/sdk/route/src/manual.ts
@@ -203,7 +203,7 @@ export class NttManualRoute<N extends Network>
     );
     const completeTransfer = ntt.completeInboundQueuedTransfer(
       toChain.chain,
-      vaa.payload.nttManagerPayload,
+      vaa.payload["nttManagerPayload"],
       this.request.destination.id.address
     );
     const finalizeTxids = await signSendWait(toChain, completeTransfer, signer);

From 47174f117d97c6157d27280c06421b46f26fa0fb Mon Sep 17 00:00:00 2001
From: Ben Guidarelli <ben.guidarelli@gmail.com>
Date: Mon, 8 Jul 2024 13:13:18 -0400
Subject: [PATCH 3/3] fix evm workspace argument

---
 .github/workflows/publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index c89ac4f0c..c52c7bc43 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -34,7 +34,7 @@ jobs:
 
           npm publish --access public --tag $tag \
             --workspace sdk/definitions \
-            --workspace sdk/evm \
+            --workspace evm/ts \
             --workspace solana \
             --workspace sdk/route
         env: