Fix ts errors

Author: AgusVelez5

deployment/helpers/utils.ts

@@ -49,11 +49,6 @@ export function flattenObject(obj: Record<string, any>, parentKey = '', result:
   return result;
 }
 
-export function getUniversalAddress(address: string): string {
-  const type = getAddressType(address);
-  return new UniversalAddress(address, type).toString()
-}
-
 export function getVerifyCommand(
   chain: ChainInfo,
   contractName: string,

deployment/package.json

@@ -2,7 +2,8 @@
   "name": "deployment",
   "scripts": {
     "evm-deps": "forge build --contracts ../evm/lib/openzeppelin-contracts/contracts/proxy && forge build --config-path ../evm/foundry.toml",
-    "build-evm": "npm run evm-deps && npx typechain --target=ethers-v5 --out-dir=./contract-bindings ../evm/out/*/*.json"
+    "build-evm": "npm run evm-deps && npx typechain --target=ethers-v5 --out-dir=./contract-bindings ../evm/out/*/*.json",
+    "check": "npx tsc --noEmit"
   },
   "author": "",
   "devDependencies": {

deployment/scripts/evm/TokenRouter/bytecode-verification-token-router.ts

@@ -7,7 +7,6 @@ evm.runOnEvms("bytecode-verification-token-router", async (chain, signer, log) =
   // The root path of the foundry project
   const rootPath = path.resolve('../evm/');
 
-
   const verifiersData = verificationApiKeys.find((x) => x.chainId == chain.chainId);
   const verifiers = flattenObject(verifiersData!);
   delete verifiers.chainId;
@@ -16,11 +15,11 @@ evm.runOnEvms("bytecode-verification-token-router", async (chain, signer, log) =
     name = name.split("-")[0];
 
     // Implementation data
-    const implementationName = "MatchingEngine";
-    const implementationPath = 'src/MatchingEngine/MatchingEngine.sol';
-    const implementationAddress = getContractAddress("MatchingEngineImplementation", chain.chainId);
-    const implementationDeploymentArgs = getDeploymentArgs("MatchingEngineImplementation", chain.chainId);
-    const implementationConstructorSignature = "constructor(address,address,address,uint24,uint24,uint8,uint8,uint8)";
+    const implementationName = "TokenRouter";
+    const implementationPath = 'src/TokenRouter/TokenRouter.sol';
+    const implementationAddress = getContractAddress("TokenRouterImplementation", chain.chainId);
+    const implementationDeploymentArgs = getDeploymentArgs("TokenRouterImplementation", chain.chainId);
+    const implementationConstructorSignature = "constructor(address,address,address,uint16,bytes32,bytes32,uint32)";
     const verifyImplementationCommand = getVerifyCommand(
       chain,
       implementationName, 

deployment/scripts/evm/TokenRouter/cross-registration-token-router.ts

@@ -1,17 +1,19 @@
-import { evm, getContractInstance, getContractAddress, contracts, getUniversalAddress } from "../../../helpers";
+import { evm, getContractInstance, getContractAddress, contracts } from "../../../helpers";
 import { TokenRouter } from "../../../contract-bindings";
 import { circle, toChain } from "@wormhole-foundation/sdk-base";
+import { toUniversal } from "@wormhole-foundation/sdk-definitions";
 
-evm.runOnEvms("cross-registration-token-router", async (chain, signer, log) => {
+evm.runOnEvms("cross-registration-token-router", async (chain, _, log) => {
   const tokenRouterAddress = getContractAddress("TokenRouterProxy", chain.chainId);
   const tokenRouter = (await getContractInstance("TokenRouter", tokenRouterAddress, chain)) as TokenRouter;
   const deployedTokenRouters = contracts['TokenRouterProxy'].filter((router) => router.chainId !== chain.chainId);
-
+  const chainName = toChain(chain.chainId);
+  
   for (const router of deployedTokenRouters) {
     const circleDomain = circle.toCircleChainId(chain.network, toChain(router.chainId));
     const endpoint = {
-      router: getUniversalAddress(router.address),
-      mintRecipient: getUniversalAddress(router.address)
+      router: toUniversal(chainName, router.address).toString(),
+      mintRecipient: toUniversal(chainName, router.address).toString()
     };
 
     if (router.chainId === 0) 

deployment/scripts/evm/TokenRouter/upgrade-token-router.ts

@@ -1,8 +1,7 @@
-import { evm, ChainInfo, getContractInstance, getContractAddress, getDependencyAddress, getAddressType } from "../../../helpers";
-import { deployImplementation, getTokenRouterConfiguration } from "./utils";
+import { evm, ChainInfo, getContractInstance, getContractAddress, getDependencyAddress } from "../../../helpers";
+import { deployImplementation, getMintRecipientAddress, getTokenRouterConfiguration, matchingEngineChain, matchingEngineDomain } from "./utils";
 import { TokenRouter } from "../../../contract-bindings";
-import { TokenRouterConfiguration } from "../../../config/config-types";
-import { UniversalAddress } from "@wormhole-foundation/sdk-definitions";
+import { toUniversal } from "@wormhole-foundation/sdk-definitions";
 
 evm.runOnEvms("upgrade-token-router", async (chain, signer, log) => {
   const currentImplementationAddress = getContractAddress("TokenRouterImplementation", chain.chainId);
@@ -11,7 +10,7 @@ evm.runOnEvms("upgrade-token-router", async (chain, signer, log) => {
   const config = await getTokenRouterConfiguration(chain);
 
   log(`Checking immutables for TokenRouter`);
-  checkImmutables(proxy, config, chain);
+  checkImmutables(proxy, chain);
 
   const newImplementation = await deployImplementation(chain, signer, config, log);
 
@@ -20,13 +19,13 @@ evm.runOnEvms("upgrade-token-router", async (chain, signer, log) => {
   await proxy.upgradeContract(newImplementation.address);
 });
 
-async function checkImmutables(tokenRouter: TokenRouter, config: TokenRouterConfiguration, chain: ChainInfo) {
+async function checkImmutables(tokenRouter: TokenRouter, chain: ChainInfo) {
   const [
     token,
-    matchingEngineMintRecipient,
-    matchingEngineChain,
-    matchingEngineDomain,
-    matchingEngineAddress,
+    savedMatchingEngineMintRecipient,
+    savedMatchingEngineChain,
+    savedMatchingEngineDomain,
+    savedMatchingEngineAddress,
   ] = await Promise.all([
     tokenRouter.orderToken(),
     tokenRouter.matchingEngineMintRecipient(),
@@ -35,23 +34,21 @@ async function checkImmutables(tokenRouter: TokenRouter, config: TokenRouterConf
     tokenRouter.matchingEngineAddress(),
   ]);
 
-  const mintRecipientAddressType = getAddressType(config.matchingEngineMintRecipient);
-  const expectedMatchingEngineMintRecipient = (new UniversalAddress(config.matchingEngineMintRecipient, mintRecipientAddressType)).toString();
-  const localMatchingEngineAddress = getContractAddress("MatchingEngineProxy", chain.chainId);
-  const matchingEngineAddressType = getAddressType(localMatchingEngineAddress);
-  const expectedMatchingEngineAddress = (new UniversalAddress(localMatchingEngineAddress, matchingEngineAddressType)).toString();
+  const matchingEngineMintRecipient = toUniversal("Solana", getMintRecipientAddress()).toString();
+  const localMatchingEngineAddress = getContractAddress("MatchingEngineProxy", matchingEngineChain);
+  const matchingEngineAddress = toUniversal("Solana", localMatchingEngineAddress).toString();
   const tokenAddress = getDependencyAddress("token", chain.chainId);
 
-  if (matchingEngineMintRecipient.toLowerCase() !== expectedMatchingEngineMintRecipient.toLowerCase())
+  if (savedMatchingEngineMintRecipient.toLowerCase() !== matchingEngineMintRecipient.toLowerCase())
     throw new Error(`MatchingEngineMintRecipient is an immutable value and cannot be changed.`);
 
-  if (matchingEngineChain !== Number(config.matchingEngineChain))
+  if (savedMatchingEngineChain !== matchingEngineChain)
     throw new Error(`MatchingEngineChain is an immutable value and cannot be changed.`);
 
-  if (matchingEngineDomain !== Number(config.matchingEngineDomain))
+  if (savedMatchingEngineDomain !== matchingEngineDomain)
     throw new Error(`MatchingEngineDomain is an immutable value and cannot be changed.`);
 
-  if (matchingEngineAddress.toLowerCase() !== expectedMatchingEngineAddress.toLowerCase())
+  if (savedMatchingEngineAddress.toLowerCase() !== matchingEngineAddress.toLowerCase())
     throw new Error(`MatchingEngineAddress is an immutable value and cannot be changed.`);
 
   if (token.toLowerCase() !== tokenAddress.toLowerCase())

deployment/scripts/evm/TokenRouter/utils.ts

@@ -2,38 +2,47 @@ import { ethers } from "ethers";
 import { TokenRouterConfiguration } from "../../../config/config-types";
 import { TokenRouter, TokenRouter__factory } from "../../../contract-bindings";
 import { ChainInfo, getChainConfig, LoggerFn, getDependencyAddress, writeDeployedContract, getContractAddress, getContractInstance, logComparison, someoneIsDifferent } from "../../../helpers";
-import { ERC20 } from "../../../contract-bindings/ERC20";
-import { UniversalAddress } from "@wormhole-foundation/sdk-definitions";
+import { IERC20 } from "../../../contract-bindings";
+import { UniversalAddress, toUniversal } from "@wormhole-foundation/sdk-definitions";
+import { toChain } from "@wormhole-foundation/sdk-base";
 
-export function getTokenRouterConfiguration(chain: ChainInfo): Promise<TokenRouterConfiguration> {
-  return getChainConfig<TokenRouterConfiguration>("token-router", chain.chainId);
-}
+/**
+ * Chain ID for the Solana wormhole chain
+ */
+export const matchingEngineChain = 1; 
+
+/**
+ * CCTP Domain for Solana 
+ */
+export const matchingEngineDomain = 5;
 
 // TODO
-function getMintRecipientAddress() {
+export function getMintRecipientAddress() {
   return '6y7V8dL673XFzm9QyC5vvh3itWkp7wztahBd2yDqsyrK'
 };
 
+export function getTokenRouterConfiguration(chain: ChainInfo): Promise<TokenRouterConfiguration> {
+  return getChainConfig<TokenRouterConfiguration>("token-router", chain.chainId);
+}
+
 export async function deployImplementation(chain: ChainInfo, signer: ethers.Signer, config: TokenRouterConfiguration, log: LoggerFn) {
   const factory = new TokenRouter__factory(signer);
   const token = getDependencyAddress("token", config.chainId);
   const wormhole = getDependencyAddress("wormhole", config.chainId);
   const tokenMessenger = getDependencyAddress("tokenMessenger", config.chainId);
 
-  const matchingEngineMintRecipient = (new UniversalAddress(getMintRecipientAddress(), 'base58')).toString();
-  const matchinEngineChain = 1; // Solana wormhole chain id
-  const matchingEngineDomain = 5; // Solana cctp domain
+  const matchingEngineMintRecipient = toUniversal("Solana", getMintRecipientAddress()).toString();
   let matchingEngineAddress = (getContractAddress(
     "MatchingEngineProxy", 
-    matchinEngineChain
+    matchingEngineChain
   ));
-  matchingEngineAddress = (new UniversalAddress(matchingEngineAddress, 'base58')).toString();
+  matchingEngineAddress = toUniversal("Solana", matchingEngineAddress).toString();
 
   const deployment = await factory.deploy(
     token,
     wormhole,
     tokenMessenger,
-    matchinEngineChain,
+    matchingEngineChain,
     matchingEngineAddress,
     matchingEngineMintRecipient,
     matchingEngineDomain,
@@ -48,7 +57,7 @@ export async function deployImplementation(chain: ChainInfo, signer: ethers.Sign
     token,
     wormhole,
     tokenMessenger,
-    matchinEngineChain,
+    matchingEngineChain,
     matchingEngineAddress,
     matchingEngineMintRecipient,
     matchingEngineDomain
@@ -66,7 +75,7 @@ export async function getOnChainTokenRouterConfiguration(chain: ChainInfo) {
   // Get the allowance for the token messenger
   const tokenMessengerAddress = getDependencyAddress("tokenMessenger", chain.chainId);
   const orderTokenAddress = await tokenRouter.orderToken();
-  const orderToken = (await getContractInstance("ERC20", orderTokenAddress, chain)) as ERC20;
+  const orderToken = (await getContractInstance("IERC20", orderTokenAddress, chain)) as IERC20;
   const cctpAllowance = await orderToken.allowance(tokenRouterProxyAddress, tokenMessengerAddress);
   const ownerAssistant = await tokenRouter.getOwnerAssistant();
   const { enabled, maxAmount, baseFee, initAuctionFee} = await tokenRouter.getFastTransferParameters();

deployment/scripts/solana/initializeMatchingEngine.ts

@@ -1,7 +1,8 @@
 import {
-    ComputeBudgetProgram,
-    Connection,
-    PublicKey,
+  AccountInfo,
+  ComputeBudgetProgram,
+  Connection,
+  PublicKey,
 } from "@solana/web3.js";
 import "dotenv/config";
 import { uint64ToBN } from "@wormhole-foundation/example-liquidity-layer-solana/common";
@@ -30,7 +31,7 @@ async function initialize(matchingEngine: MatchingEngineProgram, signer: SolanaL
     const custodian = matchingEngine.custodianAddress();
     log("custodian", custodian.toString());
 
-    const exists = await connection.getAccountInfo(custodian).then((acct) => acct != null);
+    const exists = await connection.getAccountInfo(custodian).then((acct: null | AccountInfo<Buffer>) => acct != null);
     if (exists) {
         log("already initialized");
         return;

deployment/scripts/solana/registerRoutersInMatchingEngine.ts

@@ -1,7 +1,8 @@
 import {
-    ComputeBudgetProgram,
-    Connection,
-    PublicKey,
+  AccountInfo,
+  ComputeBudgetProgram,
+  Connection,
+  PublicKey,
 } from "@solana/web3.js";
 import "dotenv/config";
 import { MatchingEngineProgram } from "@wormhole-foundation/example-liquidity-layer-solana/matchingEngine";
@@ -16,8 +17,10 @@ import { TokenRouterProgram } from "@wormhole-foundation/example-liquidity-layer
 solana.runOnSolana("register-routers-matching-engine", async (chain, signer, log) => {
     const matchingEngineId = getContractAddress("MatchingEngine", chain.chainId) as ProgramId;
 
-    const env = "Mainnet";
-    const usdcMint = new PublicKey(circle.usdcContract(env, "Solana"));
+    if (chain.network === "Devnet")
+      throw new Error("Devnet is not supported by USDC. Use Mainnet or Testnet.");
+
+    const usdcMint = new PublicKey(circle.usdcContract(chain.network, "Solana"));
     const connection = new Connection(chain.rpc, solana.connectionCommitmentLevel);
     const matchingEngine = new MatchingEngineProgram(connection, matchingEngineId, usdcMint);
 
@@ -60,15 +63,15 @@ async function addCctpRouterEndpoint(
     foreignMintRecipient: string | null,
     log: LoggerFn,
 ) {
-    await matchingEngine.fetchCustodian().catch((_) => {
+    await matchingEngine.fetchCustodian().catch((_: unknown) => {
         throw new Error("no custodian found");
     });
 
     const connection = matchingEngine.program.provider.connection;
 
     const foreignChainId = toChainId(foreignChain);
     const endpoint = matchingEngine.routerEndpointAddress(foreignChainId);
-    const exists = await connection.getAccountInfo(endpoint).then((acct) => acct != null);
+    const exists = await connection.getAccountInfo(endpoint).then((acct: null | AccountInfo<Buffer>) => acct != null);
 
     const endpointAddress = Array.from(toUniversal(foreignChain, foreignEmitter).unwrap());
     const endpointMintRecipient =
@@ -153,15 +156,15 @@ async function addSolanaCctpRouterEndpoint(
     tokenRouter: TokenRouterProgram,
     log: LoggerFn,
 ) {
-    await matchingEngine.fetchCustodian().catch((_) => {
+    await matchingEngine.fetchCustodian().catch((_: unknown) => {
         throw new Error("no custodian found");
     });
 
     const connection = matchingEngine.program.provider.connection;
 
     const chain = toChainId("Solana");
     const endpoint = matchingEngine.routerEndpointAddress(chain);
-    const exists = await connection.getAccountInfo(endpoint).then((acct) => acct != null);
+    const exists = await connection.getAccountInfo(endpoint).then((acct: null | AccountInfo<Buffer>) => acct != null);
 
     const endpointAddress = Array.from(
         toUniversal("Solana", tokenRouter.custodianAddress().toString()).unwrap(),