feat(infra): USDT OFT warp route deployment + SDK fix for unproxied contracts (#8507)

Author: Mo-Hussain

.registryrc

@@ -1 +1 @@
-a0953ebb7ba67657cb61816d416a8d6780dae9a6
+5f7433dde94644ff91ddb574e77223600a5a1c70

rust/main/app-contexts/mainnet_config.json

@@ -42215,6 +42215,71 @@
         }
       ]
     },
+    {
+      "name": "USDT/oft",
+      "matchingList": [
+        {
+          "originDomain": 42161,
+          "senderAddress": [
+            "0x000000000000000000000000e4c1a1e54c232454311cf68610c3885fdd991c0e"
+          ],
+          "destinationDomain": 1,
+          "recipientAddress": [
+            "0x0000000000000000000000007bb4fe8f406fb7b22487fa2e3bcbcb6a38cf29e6"
+          ]
+        },
+        {
+          "originDomain": 42161,
+          "senderAddress": [
+            "0x000000000000000000000000e4c1a1e54c232454311cf68610c3885fdd991c0e"
+          ],
+          "destinationDomain": 9745,
+          "recipientAddress": [
+            "0x00000000000000000000000093bffa2231fba5029997603fb68d9ac08024baa2"
+          ]
+        },
+        {
+          "originDomain": 1,
+          "senderAddress": [
+            "0x0000000000000000000000007bb4fe8f406fb7b22487fa2e3bcbcb6a38cf29e6"
+          ],
+          "destinationDomain": 42161,
+          "recipientAddress": [
+            "0x000000000000000000000000e4c1a1e54c232454311cf68610c3885fdd991c0e"
+          ]
+        },
+        {
+          "originDomain": 1,
+          "senderAddress": [
+            "0x0000000000000000000000007bb4fe8f406fb7b22487fa2e3bcbcb6a38cf29e6"
+          ],
+          "destinationDomain": 9745,
+          "recipientAddress": [
+            "0x00000000000000000000000093bffa2231fba5029997603fb68d9ac08024baa2"
+          ]
+        },
+        {
+          "originDomain": 9745,
+          "senderAddress": [
+            "0x00000000000000000000000093bffa2231fba5029997603fb68d9ac08024baa2"
+          ],
+          "destinationDomain": 42161,
+          "recipientAddress": [
+            "0x000000000000000000000000e4c1a1e54c232454311cf68610c3885fdd991c0e"
+          ]
+        },
+        {
+          "originDomain": 9745,
+          "senderAddress": [
+            "0x00000000000000000000000093bffa2231fba5029997603fb68d9ac08024baa2"
+          ],
+          "destinationDomain": 1,
+          "recipientAddress": [
+            "0x0000000000000000000000007bb4fe8f406fb7b22487fa2e3bcbcb6a38cf29e6"
+          ]
+        }
+      ]
+    },
     {
       "name": "RISE/bsc-ethereum",
       "matchingList": [

typescript/infra/config/environments/mainnet3/warp/configGetters/getUSDTOftWarpConfig.ts

@@ -0,0 +1,54 @@
+import { ChainMap, HypTokenRouterConfig, TokenType } from '@hyperlane-xyz/sdk';
+
+import {
+  RouterConfigWithoutOwner,
+  tokens,
+} from '../../../../../src/config/warp.js';
+import { awIcas } from '../../governance/ica/aw.js';
+import { awSafes } from '../../governance/safe/aw.js';
+
+const deploymentChains = ['ethereum', 'arbitrum', 'plasma'] as const;
+
+export type DeploymentChain = (typeof deploymentChains)[number];
+
+const lzEids: Record<DeploymentChain, number> = {
+  ethereum: 30101,
+  arbitrum: 30110,
+  plasma: 30383,
+};
+
+const oftAddresses: Record<DeploymentChain, string> = {
+  ethereum: '0x6C96dE32CEa08842dcc4058c14d3aaAD7Fa41dee',
+  arbitrum: '0x14E4A1B13bf7F943c8ff7C51fb60FA964A298D92',
+  plasma: '0x02ca37966753bDdDf11216B73B16C1dE756A7CF9',
+};
+
+const ownersByChain: Record<DeploymentChain, string> = {
+  ethereum: awSafes.ethereum,
+  // arbitrum stays inline until awIcas.arbitrum is exported again in aw.ts
+  arbitrum: '0xD2757Bbc28C80789Ed679f22Ac65597Cacf51A45',
+  plasma: awIcas.plasma,
+};
+
+export const getUSDTOftWarpConfig = async (
+  routerConfig: ChainMap<RouterConfigWithoutOwner>,
+): Promise<ChainMap<HypTokenRouterConfig>> =>
+  Object.fromEntries(
+    deploymentChains.map((chain) => [
+      chain,
+      {
+        ...routerConfig[chain],
+        owner: ownersByChain[chain],
+        type: TokenType.collateralOft,
+        token: tokens[chain].USDT,
+        oft: oftAddresses[chain],
+        decimals: 6,
+        name: 'Tether USD',
+        symbol: 'USDT',
+        domainMappings: Object.fromEntries(
+          Object.entries(lzEids).filter(([c]) => c !== chain),
+        ),
+        extraOptions: '0x',
+      },
+    ]),
+  );

typescript/infra/config/environments/mainnet3/warp/warpIds.ts

@@ -151,7 +151,7 @@ export enum WarpRouteIds {
 
   // TODO: uncomment when USDTOft warp routes are in the registry
   // USDT OFT
-  // USDTOft = 'USDT/oft',
+  USDTOft = 'USDT/oft',
   // USDTOftLegacy = 'USDT/oft-legacy',
 
   // RISE routes

typescript/infra/config/warp.ts

@@ -139,6 +139,7 @@ import {
 import { WarpRouteIds } from './environments/mainnet3/warp/warpIds.js';
 import { getCCTPWarpConfig as getTestnetCCTPWarpConfig } from './environments/testnet4/warp/getCCTPConfig.js';
 import { DEFAULT_REGISTRY_URI } from './registry.js';
+import { getUSDTOftWarpConfig } from './environments/mainnet3/warp/configGetters/getUSDTOftWarpConfig.js';
 import { getUSDTSTAGEWarpConfig } from './environments/mainnet3/warp/configGetters/getUSDTSTAGEWarpConfig.js';
 
 type WarpConfigGetter = (
@@ -226,6 +227,7 @@ export const warpConfigGetterMap: Record<string, WarpConfigGetter> = {
   [WarpRouteIds.Eni1Piece]: getEni1PieceWarpConfig,
   [WarpRouteIds.ModeUSDTSTAGE]: getUSDTSTAGEWarpConfig,
   [WarpRouteIds.AleoUSDC]: getAleoUSDCWarpConfig,
+  [WarpRouteIds.USDTOft]: getUSDTOftWarpConfig,
 };
 
 type StrategyConfigGetter = () => ChainSubmissionStrategy;

typescript/sdk/src/token/EvmWarpModule.hardhat-test.ts

@@ -2314,4 +2314,40 @@ describe('EvmWarpModule', async () => {
       );
     });
   });
+
+  describe('createHookUpdateTxs', () => {
+    const ROUTE_ADDRESS = '0x1111111111111111111111111111111111111111';
+    const TOKEN_ADDRESS = '0x2222222222222222222222222222222222222222';
+
+    let warpModule: EvmWarpModule;
+
+    before(() => {
+      warpModule = new EvmWarpModule(multiProvider, {
+        chain,
+        config: {} as HypTokenRouterConfig,
+        addresses: {
+          deployedTokenRoute: ROUTE_ADDRESS,
+          ...ismFactoryAddresses,
+        },
+      });
+    });
+
+    it('returns empty when expected hook is AddressZero', async () => {
+      const actual = {
+        ...baseConfig,
+        type: TokenType.collateral,
+        token: TOKEN_ADDRESS,
+      } as DerivedTokenRouterConfig;
+      const expected = {
+        ...baseConfig,
+        type: TokenType.collateral,
+        token: TOKEN_ADDRESS,
+        hook: ethers.constants.AddressZero,
+      } as HypTokenRouterConfig;
+
+      expect(
+        await warpModule.createHookUpdateTxs(actual, expected),
+      ).to.deep.equal([]);
+    });
+  });
 });