remove legacy relayer code (#897)

Author: connorstake

cli/src/commands/manual.ts

@@ -488,24 +488,12 @@ export function createManualCommand(
               vaa = deserialize("Ntt:WormholeTransfer", vaaBytes);
             } catch (e) {
               console.error(
-                colors.yellow(
-                  "Failed to deserialize as Ntt:WormholeTransfer, trying Ntt:WormholeTransferStandardRelayer..."
+                colors.red(
+                  "Failed to deserialize VAA as any known NTT transfer type."
                 )
               );
-              try {
-                vaa = deserialize(
-                  "Ntt:WormholeTransferStandardRelayer",
-                  vaaBytes
-                );
-              } catch (e2) {
-                console.error(
-                  colors.red(
-                    "Failed to deserialize VAA as any known NTT transfer type."
-                  )
-                );
-                if (e2 instanceof Error) console.error(e2.message);
-                process.exit(1);
-              }
+              if (e instanceof Error) console.error(e.message);
+              process.exit(1);
             }
 
             console.log(colors.blue("📨 Manual Redeem Operation"));

evm/cfg/WormholeNttConfig.json.sample

@@ -5,8 +5,6 @@
             "decimals":,
             "inboundLimit":,
             "isEvmChain": true,
-            "isWormholeRelayingEnabled": true,
-            "isSpecialRelayingEnabled": false,
             "nttManager": "0x00000000000000000000000000000000000000000000000000000000deadbeef",
             "wormholeTransceiver": "0x00000000000000000000000000000000000000000000000000000000deadbeef"
         },
@@ -15,8 +13,6 @@
             "decimals":,
             "inboundLimit":,
             "isEvmChain": true,
-            "isWormholeRelayingEnabled": true,
-            "isSpecialRelayingEnabled": false,
             "nttManager": "0x00000000000000000000000000000000000000000000000000000000deadbeef",
             "wormholeTransceiver": "0x00000000000000000000000000000000000000000000000000000000deadbeef"
         }

evm/script/helpers/ParseNttConfig.sol

@@ -17,8 +17,6 @@ contract ParseNttConfig is Script {
         uint8 decimals;
         uint256 inboundLimit;
         bool isEvmChain;
-        bool isSpecialRelayingEnabled;
-        bool isWormholeRelayingEnabled;
         bytes32 nttManager;
         bytes32 wormholeTransceiver;
     }

evm/ts/src/ntt.ts

@@ -165,54 +165,6 @@ export class EvmNttWormholeTranceiver<N extends Network, C extends EvmChains>
       "WormholeTransceiver.receiveMessage"
     );
   }
-
-  async isWormholeRelayingEnabled(destChain: Chain): Promise<boolean> {
-    if (!("isWormholeRelayingEnabled" in this.transceiver)) return false;
-    return await this.transceiver.isWormholeRelayingEnabled(
-      toChainId(destChain)
-    );
-  }
-
-  async *setIsWormholeRelayingEnabled(destChain: Chain, enabled: boolean) {
-    if (!("setIsWormholeRelayingEnabled" in this.transceiver)) {
-      throw new Error(
-        "setIsWormholeRelayingEnabled is not supported by this ABI version"
-      );
-    }
-    const tx =
-      await this.transceiver.setIsWormholeRelayingEnabled.populateTransaction(
-        toChainId(destChain),
-        enabled
-      );
-    yield this.manager.createUnsignedTx(
-      tx,
-      "WormholeTransceiver.setWormholeRelayingEnabled"
-    );
-  }
-
-  async isSpecialRelayingEnabled(destChain: Chain): Promise<boolean> {
-    if (!("isSpecialRelayingEnabled" in this.transceiver)) return false;
-    return await this.transceiver.isSpecialRelayingEnabled(
-      toChainId(destChain)
-    );
-  }
-
-  async *setIsSpecialRelayingEnabled(destChain: Chain, enabled: boolean) {
-    if (!("setIsSpecialRelayingEnabled" in this.transceiver)) {
-      throw new Error(
-        "setIsSpecialRelayingEnabled is not supported by this ABI version"
-      );
-    }
-    const tx =
-      await this.transceiver.setIsSpecialRelayingEnabled.populateTransaction(
-        toChainId(destChain),
-        enabled
-      );
-    yield this.manager.createUnsignedTx(
-      tx,
-      "WormholeTransceiver.setSpecialRelayingEnabled"
-    );
-  }
 }
 
 export class EvmNtt<N extends Network, C extends EvmChains>
@@ -374,25 +326,8 @@ export class EvmNtt<N extends Network, C extends EvmChains>
     yield this.createUnsignedTx(tx, "Ntt.setThreshold");
   }
 
-  async isRelayingAvailable(destination: Chain): Promise<boolean> {
-    const enabled = await Promise.all(
-      this.xcvrs.map(async (x) => {
-        const [wh, special] = await Promise.all([
-          x.isWormholeRelayingEnabled(destination),
-          x.isSpecialRelayingEnabled(destination),
-        ]);
-        return wh || special;
-      })
-    );
-
-    return enabled.filter((x) => x).length > 0;
-  }
-
   async getIsExecuted(attestation: Ntt.Attestation): Promise<boolean> {
-    const payload =
-      attestation.payloadName === "WormholeTransfer"
-        ? attestation.payload
-        : attestation.payload["payload"];
+    const payload = attestation.payload;
     const isExecuted = await this.manager.isMessageExecuted(
       Ntt.messageDigest(attestation.emitterChain, payload["nttManagerPayload"])
     );
@@ -404,10 +339,7 @@ export class EvmNtt<N extends Network, C extends EvmChains>
   async getIsTransferInboundQueued(
     attestation: Ntt.Attestation
   ): Promise<boolean> {
-    const payload =
-      attestation.payloadName === "WormholeTransfer"
-        ? attestation.payload
-        : attestation.payload["payload"];
+    const payload = attestation.payload;
     return (
       (await this.getInboundQueuedTransfer(
         attestation.emitterChain,
@@ -417,10 +349,7 @@ export class EvmNtt<N extends Network, C extends EvmChains>
   }
 
   getIsApproved(attestation: Ntt.Attestation): Promise<boolean> {
-    const payload =
-      attestation.payloadName === "WormholeTransfer"
-        ? attestation.payload
-        : attestation.payload["payload"];
+    const payload = attestation.payload;
     return this.manager.isMessageApproved(
       Ntt.messageDigest(attestation.emitterChain, payload["nttManagerPayload"])
     );

sdk/README.md

@@ -33,7 +33,7 @@ For an example of using the NTT Route, refer to the [route example](examples/src
 ### Before (4.x)
 
 ```ts
-import { nttAutomaticRoute } from "@wormhole-foundation/sdk-route-ntt";
+import { nttManualRoute } from "@wormhole-foundation/sdk-route-ntt";
 // Protocols auto-registered by side-effect of importing the NTT platform packages
 ```
 

sdk/definitions/src/layouts/index.ts

@@ -1,7 +1,6 @@
 import {
   NamedPayloads,
   RegisterPayloadTypes,
-  deliveryInstructionLayout,
 } from "@wormhole-foundation/sdk-definitions";
 import { nttManagerMessageLayout } from "./manager.js";
 import { transceiverInfo, transceiverRegistration } from "./transceiver.js";
@@ -19,14 +18,6 @@ export const nttNamedPayloads = [
       nttManagerMessageLayout(nativeTokenTransferLayout)
     ),
   ],
-  [
-    "WormholeTransferStandardRelayer",
-    deliveryInstructionLayout(
-      wormholeTransceiverMessageLayout(
-        nttManagerMessageLayout(nativeTokenTransferLayout)
-      )
-    ),
-  ],
   ["TransceiverInfo", transceiverInfo],
   ["TransceiverRegistration", transceiverRegistration],
 ] as const satisfies NamedPayloads;

sdk/definitions/src/ntt.ts

@@ -43,7 +43,6 @@ export namespace Ntt {
     transceiver: {
       [type: string]: string;
     };
-    quoter?: string;
     svmShims?: {
       postMessageShimOverride?: string;
       verifyVaaShimOverride?: string;
@@ -94,9 +93,7 @@ export namespace Ntt {
   // TODO: what are the set of attestation types for Ntt?
   // can we know this ahead of time or does it need to be
   // flexible enough for folks to add their own somehow?
-  export type Attestation =
-    | VAA<"Ntt:WormholeTransfer">
-    | VAA<"Ntt:WormholeTransferStandardRelayer">;
+  export type Attestation = VAA<"Ntt:WormholeTransfer">;
 
   /**
    * InboundQueuedTransfer is a queued transfer from another chain
@@ -240,9 +237,6 @@ export interface Ntt<N extends Network, C extends Chain> {
     payer?: AccountAddress<C>
   ): AsyncGenerator<UnsignedTransaction<N, C>>;
 
-  /** Check to see if relaying service is available for automatic transfers */
-  isRelayingAvailable(destination: Chain): Promise<boolean>;
-
   /**
    * quoteDeliveryPrice returns the price to deliver a message to a given chain
    * the price is quote in native gas
@@ -441,10 +435,7 @@ export interface NttTransceiver<
 }
 
 export namespace WormholeNttTransceiver {
-  const _payloads = [
-    "WormholeTransfer",
-    "WormholeTransferStandardRelayer",
-  ] as const;
+  const _payloads = ["WormholeTransfer"] as const;
   export type PayloadNames = (typeof _payloads)[number];
   export type VAA<PayloadName extends PayloadNames = PayloadNames> =
     ProtocolVAA<Ntt.ProtocolName, PayloadName>;

sdk/examples/src/consts.ts

@@ -10,7 +10,6 @@ export const JITO_NTT_CONTRACTS: NttContracts = {
     token: "E3W7KwMH8ptaitYyWtxmfBUpqcuf2XieaFtQSn1LVXsA",
     manager: "WZLm4bJU4BNVmzWEwEzGVMQ5XFUc4iBmMSLutFbr41f",
     transceiver: { wormhole: "WZLm4bJU4BNVmzWEwEzGVMQ5XFUc4iBmMSLutFbr41f" },
-    quoter: "Nqd6XqA8LbsCuG8MLWWuP865NV6jR1MbXeKxD4HLKDJ",
   },
   ArbitrumSepolia: {
     token: "0x87579Dc40781e99b870DDce46e93bd58A0e58Ae5",
@@ -44,7 +43,6 @@ export const TEST_NTT_TOKENS: NttContracts = {
     token: "EetppHswYvV1jjRWoQKC1hejdeBDHR9NNzNtCyRQfrrQ",
     manager: "NTtAaoDJhkeHeaVUHnyhwbPNAN6WgBpHkHBTc6d7vLK",
     transceiver: { wormhole: "NTtAaoDJhkeHeaVUHnyhwbPNAN6WgBpHkHBTc6d7vLK" },
-    quoter: "Nqd6XqA8LbsCuG8MLWWuP865NV6jR1MbXeKxD4HLKDJ",
   },
 };
 
@@ -60,18 +58,17 @@ export const TEST_NTT_SPL22_TOKENS: NttContracts = {
     token: "BAn1Zcr48bmaK5SmzBDjoju6csFe8AT6bot4ACBJvVwU",
     manager: "NtTnpY76eiMYqYX9xkag2CSXk9cGi6hinMWbMLMDYUP",
     transceiver: { wormhole: "NtTnpY76eiMYqYX9xkag2CSXk9cGi6hinMWbMLMDYUP" },
-    quoter: "Nqd6XqA8LbsCuG8MLWWuP865NV6jR1MbXeKxD4HLKDJ",
   },
 };
 
 // Reformat NTT contracts to fit TokenConfig for Route
 function reformat(contracts: NttContracts) {
   return Object.entries(TEST_NTT_TOKENS).map(([chain, contracts]) => {
-    const { token, manager, transceiver: xcvrs, quoter } = contracts!;
+    const { token, manager, transceiver: xcvrs } = contracts!;
     const transceiver = Object.entries(xcvrs).map(([k, v]) => {
       return { type: k as NttRoute.TransceiverType, address: v };
     });
-    return { chain: chain as Chain, token, manager, quoter, transceiver };
+    return { chain: chain as Chain, token, manager, transceiver };
   });
 }
 

sdk/examples/src/route.ts

@@ -16,10 +16,7 @@ registerDefinitionsNtt();
 registerEvmNtt();
 registerSolanaNtt();
 
-import {
-  nttAutomaticRoute,
-  nttManualRoute,
-} from "@wormhole-foundation/sdk-route-ntt";
+import { nttManualRoute } from "@wormhole-foundation/sdk-route-ntt";
 import { NttTokens } from "./consts.js";
 import { getSigner } from "./helpers.js";
 
@@ -32,10 +29,7 @@ import { getSigner } from "./helpers.js";
   const srcSigner = await getSigner(src);
   const dstSigner = await getSigner(dst);
 
-  const resolver = wh.resolver([
-    nttManualRoute({ tokens: NttTokens }),
-    nttAutomaticRoute({ tokens: NttTokens }),
-  ]);
+  const resolver = wh.resolver([nttManualRoute({ tokens: NttTokens })]);
 
   const { chain, token } = NttTokens.Test[0]!;
   const sendToken = Wormhole.tokenId(chain, token);

sdk/route/__tests__/executorFee.test.ts

@@ -35,7 +35,6 @@ const nttConfig: NttExecutorRoute.Config["ntt"] = {
             address: "ExVbjD8inGXkt7Cx8jVr4GF175sQy1MeqgfaY53Ah8as",
           },
         ],
-        quoter: "Nqd6XqA8LbsCuG8MLWWuP865NV6jR1MbXeKxD4HLKDJ",
       },
       {
         chain: "Sepolia",