deploy: retrieves mint recipient from solana sdk

Author: scnale

deployment/helpers/interfaces.ts

@@ -15,7 +15,7 @@ export type ChainInfo = {
   chainId: ChainId;
   rpc: string;
   /**
-   * Native ChainId
+   * Native (e.g. EIP-155) ChainId
    */
   externalId?: string;
   network: Network;

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

@@ -7,13 +7,14 @@ 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));
+    // TODO: handle Solana registrations correctly in regards to mintRecipient
+    const routerChain = toChain(router.chainId);
     const endpoint = {
-      router: toUniversal(chainName, router.address).toString(),
-      mintRecipient: toUniversal(chainName, router.address).toString()
+      router: toUniversal(routerChain, router.address).toString(),
+      mintRecipient: toUniversal(routerChain, router.address).toString()
     };
 
     if (router.chainId === 0) 

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

@@ -1,12 +1,23 @@
 import { ethers } from "ethers";
-import { evm, LoggerFn, writeDeployedContract } from "../../../helpers";
+import { ecosystemChains, evm, LoggerFn, solana, writeDeployedContract } from "../../../helpers";
 import { TokenRouterConfiguration } from "../../../config/config-types";
-import { deployImplementation, getTokenRouterConfiguration } from "./utils";
+import { deployImplementation, getMatchingEngineMintRecipientAddress, getTokenRouterConfiguration } from "./utils";
 import { ERC1967Proxy__factory } from "../../../contract-bindings";
+import { toUniversal } from "@wormhole-foundation/sdk-definitions";
+import { Connection } from "@solana/web3.js";
 
 evm.runOnEvms("deploy-token-router", async (chain, signer, log) => {
   const config = await getTokenRouterConfiguration(chain);
-  const implementation = await deployImplementation(chain, signer, config, log);
+
+  // TODO: write a `getChain(chainId: ChainId): ChainInfo` function to replace these lines
+  if (ecosystemChains.solana.networks.length !== 1) {
+    throw Error("Unexpected number of Solana networks.");
+  }
+  const solanaRpc = ecosystemChains.solana.networks[0].rpc;
+
+  const solanaConnection = new Connection(solanaRpc, solana.connectionCommitmentLevel);
+  const matchingEngineMintRecipient = toUniversal("Solana", getMatchingEngineMintRecipientAddress(solanaConnection));
+  const implementation = await deployImplementation(signer, config, matchingEngineMintRecipient, log);
   await deployProxy(signer, config, implementation, log);
 });
 

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

@@ -1,25 +1,35 @@
-import { evm, ChainInfo, getContractInstance, getContractAddress, getDependencyAddress } from "../../../helpers";
-import { deployImplementation, getMintRecipientAddress, getTokenRouterConfiguration, matchingEngineChain, matchingEngineDomain } from "./utils";
+import { evm, ChainInfo, getContractInstance, getContractAddress, getDependencyAddress, ecosystemChains, solana } from "../../../helpers";
+import { deployImplementation, getMatchingEngineMintRecipientAddress, getTokenRouterConfiguration, matchingEngineChain, matchingEngineDomain } from "./utils";
 import { TokenRouter } from "../../../contract-bindings";
-import { toUniversal } from "@wormhole-foundation/sdk-definitions";
+import { UniversalAddress, toUniversal } from "@wormhole-foundation/sdk-definitions";
+import { Connection } from "@solana/web3.js";
 
 evm.runOnEvms("upgrade-token-router", async (chain, signer, log) => {
   const currentImplementationAddress = getContractAddress("TokenRouterImplementation", chain.chainId);
   const proxyAddress = getContractAddress("TokenRouterProxy", chain.chainId);
   const proxy = (await getContractInstance("TokenRouter", proxyAddress, chain)) as TokenRouter;
   const config = await getTokenRouterConfiguration(chain);
 
+  // TODO: write a `getChain(chainId: ChainId): ChainInfo` function to replace these lines
+  if (ecosystemChains.solana.networks.length !== 1) {
+    throw Error("Unexpected number of Solana networks.");
+  }
+  const solanaRpc = ecosystemChains.solana.networks[0].rpc;
+
+  const solanaConnection = new Connection(solanaRpc, solana.connectionCommitmentLevel);
+  const matchingEngineMintRecipient = toUniversal("Solana", getMatchingEngineMintRecipientAddress(solanaConnection));
+
   log(`Checking immutables for TokenRouter`);
-  checkImmutables(proxy, chain);
+  checkImmutables(proxy, chain, matchingEngineMintRecipient);
 
-  const newImplementation = await deployImplementation(chain, signer, config, log);
+  const newImplementation = await deployImplementation(signer, config, matchingEngineMintRecipient, log);
 
   log(`Upgrading TokenRouter implementation from ${currentImplementationAddress} to ${newImplementation.address}`);
-  
+
   await proxy.upgradeContract(newImplementation.address);
 });
 
-async function checkImmutables(tokenRouter: TokenRouter, chain: ChainInfo) {
+async function checkImmutables(tokenRouter: TokenRouter, chain: ChainInfo, matchingEngineMintRecipient: UniversalAddress) {
   const [
     token,
     savedMatchingEngineMintRecipient,
@@ -34,12 +44,11 @@ async function checkImmutables(tokenRouter: TokenRouter, chain: ChainInfo) {
     tokenRouter.matchingEngineAddress(),
   ]);
 
-  const matchingEngineMintRecipient = toUniversal("Solana", getMintRecipientAddress()).toString();
   const localMatchingEngineAddress = getContractAddress("MatchingEngineProxy", matchingEngineChain);
   const matchingEngineAddress = toUniversal("Solana", localMatchingEngineAddress).toString();
   const tokenAddress = getDependencyAddress("token", chain.chainId);
 
-  if (savedMatchingEngineMintRecipient.toLowerCase() !== matchingEngineMintRecipient.toLowerCase())
+  if (savedMatchingEngineMintRecipient.toLowerCase() !== matchingEngineMintRecipient.toString().toLowerCase())
     throw new Error(`MatchingEngineMintRecipient is an immutable value and cannot be changed.`);
 
   if (savedMatchingEngineChain !== matchingEngineChain)

deployment/scripts/evm/TokenRouter/utils.ts

@@ -4,7 +4,9 @@ import { TokenRouter, TokenRouter__factory } from "../../../contract-bindings";
 import { ChainInfo, getChainConfig, LoggerFn, getDependencyAddress, writeDeployedContract, getContractAddress, getContractInstance, logComparison, someoneIsDifferent } from "../../../helpers";
 import { IERC20 } from "../../../contract-bindings";
 import { UniversalAddress, toUniversal } from "@wormhole-foundation/sdk-definitions";
-import { toChain } from "@wormhole-foundation/sdk-base";
+import { circle, toChain, toChainId } from "@wormhole-foundation/sdk-base";
+import { MatchingEngineProgram, ProgramId } from "@wormhole-foundation/example-liquidity-layer-solana/matchingEngine";
+import { Connection, PublicKey } from "@solana/web3.js";
 
 /**
  * Chain ID for the Solana wormhole chain
@@ -16,35 +18,37 @@ export const matchingEngineChain = 1;
  */
 export const matchingEngineDomain = 5;
 
-// TODO
-export function getMintRecipientAddress() {
-  return '6y7V8dL673XFzm9QyC5vvh3itWkp7wztahBd2yDqsyrK'
+export function getMatchingEngineMintRecipientAddress(connection: Connection) {
+  const matchingEngineId = getContractAddress("MatchingEngineProxy", toChainId("Solana")) as ProgramId;
+
+  const env = "Mainnet";
+  const usdcMint = new PublicKey(circle.usdcContract(env, "Solana"));
+  const matchingEngine = new MatchingEngineProgram(connection, matchingEngineId, usdcMint);
+  return matchingEngine.cctpMintRecipientAddress().toBytes();
 };
 
 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) {
+export async function deployImplementation(signer: ethers.Signer, config: TokenRouterConfiguration, matchingEngineMintRecipient: UniversalAddress, 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 = toUniversal("Solana", getMintRecipientAddress()).toString();
-  let matchingEngineAddress = (getContractAddress(
+  const matchingEngineAddress = toUniversal("Solana", (getContractAddress(
     "MatchingEngineProxy", 
     matchingEngineChain
-  ));
-  matchingEngineAddress = toUniversal("Solana", matchingEngineAddress).toString();
+  ))).toString();
 
   const deployment = await factory.deploy(
     token,
     wormhole,
     tokenMessenger,
     matchingEngineChain,
     matchingEngineAddress,
-    matchingEngineMintRecipient,
+    matchingEngineMintRecipient.toString(),
     matchingEngineDomain,
     {} // overrides
   );