deploy: several adjustments to initialize script

Author: scnale

deployment/config/mainnet/ecosystem.json

@@ -1,5 +1,5 @@
 {
-  "operatingChains": [23, 30],
+  "operatingChains": [1, 23, 30],
   "evm": {
     "networks": [
       {
@@ -17,6 +17,12 @@
     ]
   },
   "solana": {
-    "networks": []
+    "networks": [
+      {
+        "name": "Solana",
+        "chainId": 1,
+        "rpc": "https://api.mainnet-beta.solana.com"
+      }
+    ]
   }
 }

deployment/helpers/evm.ts

@@ -56,7 +56,7 @@ export function evmOperatingChains() {
 };
 
 export async function getSigner(chain: ChainInfo): Promise<ethers.Signer> {
-  const derivationPath = getEnv("LEDGER_BIP32_PATH");
+  const derivationPath = getEnv("EVM_LEDGER_BIP32_PATH");
   const provider = getProvider(chain);
   return LedgerSigner.create(provider, derivationPath);
 }

deployment/helpers/solana.ts

@@ -12,6 +12,7 @@ import type { SolanaScriptCb } from "./interfaces";
 import { inspect } from "util";
 
 export const connectionCommitmentLevel = (process.env.SOLANA_COMMITMENT || "confirmed") as Commitment;
+export const priorityMicrolamports = process.env.PRIORITY_MICROLAMPORTS !== "undefined" ? Number(process.env.PRIORITY_MICROLAMPORTS) : 1;
 
 export function validateSolAddress(address: string){
     try {
@@ -40,7 +41,8 @@ export async function runOnSolana(scriptName: string, cb: SolanaScriptCb) {
   const result = chains.map(async chain => {
     const log = (...args: any[]) => console.log(`[${chain.chainId}]`, ...args);
     const signer = await getSigner();
-    log(`Starting script. Signer: ${await signer.getAddress()}`);
+    // TODO: encode in base58
+    log(`Starting script. Signer: ${(await signer.getAddress()).toString("hex")}`);
 
     try {
       await cb(chain, signer, log);
@@ -57,7 +59,7 @@ export async function runOnSolana(scriptName: string, cb: SolanaScriptCb) {
 let signer: SolanaLedgerSigner | null;
 export async function getSigner(): Promise<SolanaLedgerSigner> {
   if (!signer) {
-    const derivationPath = getEnv("LEDGER_BIP32_PATH");
+    const derivationPath = getEnv("SOLANA_LEDGER_BIP32_PATH");
     signer = await SolanaLedgerSigner.create(derivationPath);
   }
 

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

@@ -44,7 +44,7 @@ async function checkImmutables(tokenRouter: TokenRouter, chain: ChainInfo, match
     tokenRouter.matchingEngineAddress(),
   ]);
 
-  const localMatchingEngineAddress = getContractAddress("MatchingEngineProxy", matchingEngineChain);
+  const localMatchingEngineAddress = getContractAddress("MatchingEngine", matchingEngineChain);
   const matchingEngineAddress = toUniversal("Solana", localMatchingEngineAddress).toString();
   const tokenAddress = getDependencyAddress("token", chain.chainId);
 

deployment/scripts/evm/TokenRouter/utils.ts

@@ -19,7 +19,7 @@ export const matchingEngineChain = 1;
 export const matchingEngineDomain = 5;
 
 export function getMatchingEngineMintRecipientAddress(connection: Connection) {
-  const matchingEngineId = getContractAddress("MatchingEngineProxy", toChainId("Solana")) as ProgramId;
+  const matchingEngineId = getContractAddress("MatchingEngine", toChainId("Solana")) as ProgramId;
 
   const env = "Mainnet";
   const usdcMint = new PublicKey(circle.usdcContract(env, "Solana"));
@@ -38,7 +38,7 @@ export async function deployImplementation(signer: ethers.Signer, config: TokenR
   const tokenMessenger = getDependencyAddress("tokenMessenger", config.chainId);
 
   const matchingEngineAddress = toUniversal("Solana", (getContractAddress(
-    "MatchingEngineProxy", 
+    "MatchingEngine",
     matchingEngineChain
   ))).toString();
 

deployment/scripts/solana/initializeMatchingEngine.ts

@@ -57,12 +57,13 @@ async function initialize(matchingEngine: MatchingEngineProgram, signer: SolanaL
         auctionParams
     );
 
+    // TODO: this doesn't check if the ATA already exists
     const splToken = await import("@solana/spl-token");
     const assocciatedTokenProgramId = splToken.ASSOCIATED_TOKEN_PROGRAM_ID;
     const associatedToken = splToken.getAssociatedTokenAddressSync(usdcMint, signerPubkey, undefined, usdcMint, assocciatedTokenProgramId);
     const createAtaInstructions = [];
     createAtaInstructions.push(splToken.createAssociatedTokenAccountInstruction(signerPubkey, associatedToken, signerPubkey, usdcMint));
-    createAtaInstructions.push(ComputeBudgetProgram.setComputeUnitPrice({ microLamports: 1 }));
+    createAtaInstructions.push(ComputeBudgetProgram.setComputeUnitPrice({ microLamports: solana.priorityMicrolamports }));
 
     const createAtaTxid = await solana.ledgerSignAndSend(connection, createAtaInstructions, []);
     log(`CreateAtaTxid ${createAtaTxid}`);