refactor

Author: kev1n-peters

evm/ts/src/multiTokenNttWithExecutor.ts

@@ -16,6 +16,8 @@ import {
   EvmPlatform,
   EvmPlatformType,
   EvmAddress,
+  EvmUnsignedTransaction,
+  addChainId,
 } from "@wormhole-foundation/sdk-evm";
 import {
   Ntt,
@@ -39,6 +41,7 @@ export class EvmMultiTokenNttWithExecutor<
 > implements MultiTokenNttWithExecutor<N, C>
 {
   readonly chainId: bigint;
+  readonly managerAddress: string;
   readonly multiTokenNttWithExecutorAddress: string;
 
   constructor(
@@ -52,6 +55,14 @@ export class EvmMultiTokenNttWithExecutor<
       chain
     ) as bigint;
 
+    const managerAddress = contracts.multiTokenNtt?.manager;
+    if (!managerAddress) {
+      throw new Error(
+        `MultiTokenNtt manager address not found for chain ${chain} on network ${network}`
+      );
+    }
+    this.managerAddress = managerAddress;
+
     const multiTokenNttWithExecutorAddress =
       multiTokenNttWithExecutorAddresses[this.network]?.[this.chain];
     if (!multiTokenNttWithExecutorAddress) {
@@ -143,7 +154,7 @@ export class EvmMultiTokenNttWithExecutor<
 
     if (isNativeToken) {
       data = iface.encodeFunctionData("transferETH", [
-        multiTokenNtt.managerAddress,
+        this.managerAddress,
         amount,
         recipientChain,
         recipient,
@@ -172,14 +183,14 @@ export class EvmMultiTokenNttWithExecutor<
           amount
         );
 
-        yield multiTokenNtt.createUnsignedTx(
+        yield this.createUnsignedTx(
           approveTx,
           "MultiTokenNttWithExecutor.Approve"
         );
       }
 
       data = iface.encodeFunctionData("transfer", [
-        multiTokenNtt.managerAddress,
+        this.managerAddress,
         tokenAddress,
         amount,
         recipientChain,
@@ -199,7 +210,7 @@ export class EvmMultiTokenNttWithExecutor<
       from: senderAddress,
     };
 
-    yield multiTokenNtt.createUnsignedTx(
+    yield this.createUnsignedTx(
       txReq,
       isNativeToken
         ? "MultiTokenNttWithExecutor.transferETH"
@@ -227,4 +238,18 @@ export class EvmMultiTokenNttWithExecutor<
       gasLimit,
     };
   }
+
+  createUnsignedTx(
+    txReq: TransactionRequest,
+    description: string,
+    parallelizable: boolean = false
+  ): EvmUnsignedTransaction<N, C> {
+    return new EvmUnsignedTransaction(
+      addChainId(txReq, this.chainId),
+      this.network,
+      this.chain,
+      description,
+      parallelizable
+    );
+  }
 }

sdk/route/src/executor/multiToken.ts

@@ -237,6 +237,8 @@ export class MultiTokenNttExecutorRoute<N extends Network>
     try {
       const executorQuote = await this.fetchExecutorQuote(request, params);
 
+      // TODO: fetch the delivery price, add it to the relayFee.amount (estimatedCost + deliveryPrice)
+
       const { remainingAmount, estimatedCost, gasDropOff, expires } =
         executorQuote;
 
@@ -335,6 +337,8 @@ export class MultiTokenNttExecutorRoute<N extends Network>
     return referrerFeeDbps;
   }
 
+  // TODO: we can probably make a bunch of these functions free in a utils file
+
   getReferrerAddress(fromChain: ChainContext<N>): ChainAddress {
     let referrer = getDefaultReferrerAddress(fromChain.chain);
     const referrerFeeConfig = this.staticConfig.referrerFee;