Merge branch 'main' into chore(deployment)-monad-again

aditya520 · web-flow · commit 71c8861c2cb0 · 2025-01-16T10:45:36.000-05:00
diff --git a/contract_manager/scripts/check_proposal.ts b/contract_manager/scripts/check_proposal.ts
@@ -195,7 +195,7 @@ async function main() {
             }
 
             const newImplementationCode = await getCodeDigestWithoutAddress(
-              chain.getRpcUrl(),
+              chain.getWeb3(),
               newImplementationAddress
             );
             // this should be the same keccak256 of the deployedCode property generated by truffle
diff --git a/contract_manager/scripts/latency_entropy_with_callback.ts b/contract_manager/scripts/latency_entropy_with_callback.ts
@@ -55,7 +55,7 @@ async function testLatency(
   const startTime = Date.now();
 
   const fromBlock = requestResponse.blockNumber;
-  const web3 = new Web3(contract.chain.getRpcUrl());
+  const web3 = contract.chain.getWeb3();
   const entropyContract = contract.getContract();
 
   // eslint-disable-next-line no-constant-condition
diff --git a/contract_manager/scripts/list_entropy_contracts.ts b/contract_manager/scripts/list_entropy_contracts.ts
@@ -22,7 +22,7 @@ async function main() {
     if (contract.getChain().isMainnet() === argv.testnet) continue;
     try {
       const provider = await contract.getDefaultProvider();
-      const w3 = new Web3(contract.getChain().getRpcUrl());
+      const w3 = contract.getChain().getWeb3();
       const balance = await w3.eth.getBalance(provider);
       const keeperBalance = await w3.eth.getBalance(keeperAddress);
       let version = "unknown";
diff --git a/contract_manager/scripts/load_test_entropy.ts b/contract_manager/scripts/load_test_entropy.ts
@@ -76,7 +76,7 @@ async function main() {
   const contract = findEntropyContract(chain);
   const provider = await contract.getDefaultProvider();
   const fee = await contract.getFee(provider);
-  const web3 = new Web3(contract.chain.getRpcUrl());
+  const web3 = contract.chain.getWeb3();
   const testerContract = new web3.eth.Contract(ABI, argv.testerAddress);
   const { address } = web3.eth.accounts.wallet.add(privateKey);
   const transactionObject = testerContract.methods.batchRequests(
diff --git a/contract_manager/store/chains/EvmChains.yaml b/contract_manager/store/chains/EvmChains.yaml
@@ -850,3 +850,8 @@
   rpcUrl: https://rpc.test2.btcs.network
   networkId: 1114
   type: EvmChain
+- id: monad_testnet
+  mainnet: false
+  rpcUrl: https://rpc.monad-testnet.category.xyz/rpc/nSyzM1wlIgaALWzbh3oIg5rW65AC6yjqrslOE8wb
+  networkId: 10143
+  type: EvmChain
diff --git a/contract_manager/store/contracts/EvmEntropyContracts.yaml b/contract_manager/store/contracts/EvmEntropyContracts.yaml
@@ -139,3 +139,6 @@
 - chain: monad_devnet
   address: "0x36825bf3Fbdf5a29E2d5148bfe7Dcf7B5639e320"
   type: EvmEntropyContract
+- chain: monad_testnet
+  address: "0x36825bf3Fbdf5a29E2d5148bfe7Dcf7B5639e320"
+  type: EvmEntropyContract
diff --git a/contract_manager/store/contracts/EvmPriceFeedContracts.yaml b/contract_manager/store/contracts/EvmPriceFeedContracts.yaml
@@ -472,3 +472,6 @@
 - chain: monad_devnet
   address: "0x2880aB155794e7179c9eE2e38200202908C17B43"
   type: EvmPriceFeedContract
+- chain: monad_testnet
+  address: "0x2880aB155794e7179c9eE2e38200202908C17B43"
+  type: EvmPriceFeedContract
diff --git a/contract_manager/store/contracts/EvmWormholeContracts.yaml b/contract_manager/store/contracts/EvmWormholeContracts.yaml
@@ -466,3 +466,6 @@
 - chain: monad_devnet
   address: "0xb27e5ca259702f209a29225d0eDdC131039C9933"
   type: EvmWormholeContract
+- chain: monad_testnet
+  address: "0xb27e5ca259702f209a29225d0eDdC131039C9933"
+  type: EvmWormholeContract
diff --git a/governance/xc_admin/packages/xc_admin_cli/src/index.ts b/governance/xc_admin/packages/xc_admin_cli/src/index.ts
@@ -959,7 +959,7 @@ multisigCommand(
     const updateInstruction = await lazerProgram.methods
       .update(trustedSigner, expiryTime)
       .accounts({
-        authority: await vault.getVaultAuthorityPDA(targetCluster),
+        topAuthority: await vault.getVaultAuthorityPDA(targetCluster),
         storage: SOLANA_STORAGE_ID,
       })
       .instruction();
diff --git a/governance/xc_admin/packages/xc_admin_common/src/chains.ts b/governance/xc_admin/packages/xc_admin_common/src/chains.ts
@@ -224,6 +224,7 @@ export const RECEIVER_CHAINS = {
   coredao_testnet_v2: 50114,
   bittensor_testnet: 50115,
   monad_devnet: 50116,
+  monad_testnet: 50117,
 };
 
 // If there is any overlapping value the receiver chain will replace the wormhole
diff --git a/governance/xc_admin/packages/xc_admin_common/src/deterministic_oracle_accounts.ts b/governance/xc_admin/packages/xc_admin_common/src/deterministic_oracle_accounts.ts
@@ -64,10 +64,10 @@ export async function findDetermisticAccountAddress(
   symbol: string,
   cluster: PythCluster
 ): Promise<[PublicKey, string]> {
-  const seed: string = getSeed(type, symbol);
+  const seed: string = getSeed(type, symbol).slice(0, 32);
   const address: PublicKey = await PublicKey.createWithSeed(
     PRICE_FEED_OPS_KEY,
-    seed.slice(32),
+    seed,
     getPythProgramKeyForCluster(cluster)
   );
   return [address, seed];
diff --git a/governance/xc_admin/packages/xc_admin_common/src/multisig_transaction/idl/lazer.json b/governance/xc_admin/packages/xc_admin_common/src/multisig_transaction/idl/lazer.json
@@ -238,28 +238,13 @@
             "name": "Ed25519InstructionMustPrecedeCurrentInstruction"
           },
           {
-            "name": "LoadInstructionAtFailed",
-            "fields": [
-              {
-                "defined": "ProgramError"
-              }
-            ]
+            "name": "LoadInstructionAtFailed"
           },
           {
-            "name": "LoadCurrentIndexFailed",
-            "fields": [
-              {
-                "defined": "ProgramError"
-              }
-            ]
+            "name": "LoadCurrentIndexFailed"
           },
           {
-            "name": "ClockGetFailed",
-            "fields": [
-              {
-                "defined": "ProgramError"
-              }
-            ]
+            "name": "ClockGetFailed"
           },
           {
             "name": "InvalidEd25519InstructionProgramId"
diff --git a/lazer/contracts/solana/README.md b/lazer/contracts/solana/README.md
@@ -3,10 +3,11 @@
 ## Verifiable Build
 
 To build the program in a verifiable way, use [Solana Verify CLI](https://github.com/Ellipsis-Labs/solana-verifiable-build). This tool builds the program in
-a docker container to ensure that the resulting binary is deterministic and verifiable. Run the following command to build the program:
+a docker container to ensure that the resulting binary is deterministic and verifiable. Run the following command to build the program
+in [the lazer root directory](./../../):
 
 ```bash
-solana-verify build -- --features solana-program
+solana-verify build --library-name pyth_lazer_solana_contract
 ```
 
 Once the build is complete, the program binary will be located in the `target/deploy` directory.
diff --git a/lazer/contracts/solana/package.json b/lazer/contracts/solana/package.json
@@ -7,8 +7,8 @@
     "test:format": "prettier --check **/*.*",
     "test:anchor": "CARGO_TARGET_DIR=\"$PWD/target\" anchor test",
     "test": "pnpm run test:format && pnpm run test:anchor",
-    "setup": "anchor build && pnpm ts-node scripts/setup.ts",
-    "check_trusted_signer": "pnpm ts-node scripts/check_trusted_signer.ts"
+    "setup": "pnpm ts-node scripts/setup.ts",
+    "check-trusted-signer": "pnpm ts-node scripts/check_trusted_signer.ts"
   },
   "dependencies": {
     "@coral-xyz/anchor": "^0.30.1"
diff --git a/lazer/contracts/solana/scripts/setup.ts b/lazer/contracts/solana/scripts/setup.ts
@@ -6,24 +6,30 @@ import yargs from "yargs/yargs";
 import { readFileSync } from "fs";
 import NodeWallet from "@coral-xyz/anchor/dist/cjs/nodewallet";
 
-// This script initializes the program and updates the trusted signer
+// This script initializes the program. It should be run once after the program is deployed. Additionally, if the
+// top authority be the same as the given keypair and the trusted signer and expiry time are provided, the trusted
+// signer will be updated.
 //
-// There are some assumptions made in this script:
-// 1. The program id is derived from the idl file (pytd...).
-// 2. The keypair provided is the top authority keypair
+// Note: the program id is derived from the idl file (pytd...). Run `anchor test` to generate it.
 async function main() {
   let argv = await yargs(process.argv.slice(2))
     .options({
       url: { type: "string", demandOption: true },
       "keypair-path": { type: "string", demandOption: true },
-      "trusted-signer": { type: "string", demandOption: true },
-      "expiry-time-seconds": { type: "number", demandOption: true },
+      "top-authority": { type: "string", demandOption: true },
+      treasury: { type: "string", demandOption: true },
+      "trusted-signer": { type: "string", demandOption: false },
+      "expiry-time-seconds": { type: "number", demandOption: false },
     })
     .parse();
 
   const keypair = anchor.web3.Keypair.fromSecretKey(
     new Uint8Array(JSON.parse(readFileSync(argv.keypairPath, "ascii")))
   );
+
+  const topAuthority = new anchor.web3.PublicKey(argv.topAuthority);
+  const treasury = new anchor.web3.PublicKey(argv.treasury);
+
   const wallet = new NodeWallet(keypair);
   const connection = new anchor.web3.Connection(argv.url, {
     commitment: "confirmed",
@@ -39,21 +45,27 @@ async function main() {
   if (storage.length === 0) {
     console.log("Initializing the program");
     await program.methods
-      .initialize(keypair.publicKey, anchor.web3.PublicKey.unique())
+      .initialize(topAuthority, treasury)
       .accounts({
         payer: wallet.publicKey,
       })
       .rpc();
   }
 
-  console.log("Updating the trusted signer");
-  await program.methods
-    .update(
-      new anchor.web3.PublicKey(argv.trustedSigner),
-      new anchor.BN(argv.expiryTimeSeconds)
-    )
-    .accounts({})
-    .rpc();
+  if (
+    topAuthority.equals(wallet.publicKey) &&
+    argv.trustedSigner &&
+    argv.expiryTimeSeconds
+  ) {
+    console.log("Updating the trusted signer");
+    await program.methods
+      .update(
+        new anchor.web3.PublicKey(argv.trustedSigner),
+        new anchor.BN(argv.expiryTimeSeconds)
+      )
+      .accounts({})
+      .rpc();
+  }
 }
 
 main();
diff --git a/target_chains/ethereum/sdk/js/src/index.ts b/target_chains/ethereum/sdk/js/src/index.ts
@@ -131,6 +131,7 @@ export const CONTRACT_ADDR: Record<string, string> = {
   meter_testnet: "0x5a71C07a0588074443545eE0c08fb0375564c3E4",
   mode_testnet: "0xA2aa501b19aff244D90cc15a4Cf739D2725B5729",
   monad_devnet: "0x2880aB155794e7179c9eE2e38200202908C17B43",
+  monad_testnet: "0x2880aB155794e7179c9eE2e38200202908C17B43",
   morph_holesky_testnet: "0x2880aB155794e7179c9eE2e38200202908C17B43",
   morph_testnet: "0xA2aa501b19aff244D90cc15a4Cf739D2725B5729",
   movement_evm_devnet: "0xA2aa501b19aff244D90cc15a4Cf739D2725B5729",
diff --git a/target_chains/fuel/sdk/js/package.json b/target_chains/fuel/sdk/js/package.json
@@ -22,12 +22,13 @@
   "scripts": {
     "usage-example": "ts-node src/examples/usage.ts",
     "build": "pnpm run generate-fuel-types && tsc && copyfiles -u 1 \"src/**/*.d.ts\" lib",
-    "format": "prettier --write \"src/**/*.ts\"",
+    "test:format": "prettier --check \"src/**/*.ts\"",
+    "fix:format": "prettier --write \"src/**/*.ts\"",
     "test:lint": "eslint src/",
     "prepublishOnly": "pnpm run build && pnpm run test:lint",
     "preversion": "pnpm run test:lint",
-    "version": "pnpm run format && git add -A src",
-    "generate-fuel-types": "pnpm fuels typegen -i ../../contracts/pyth-contract/out/release/*-abi.json -o ./src/types && prettier --write \"./src/types/**/*.ts\""
+    "version": "pnpm run test:format && git add -A src",
+    "generate-fuel-types": "pnpm fuels typegen -i ../../contracts/pyth-contract/out/release/*-abi.json -o ./src/types && pnpm run fix:format"
   },
   "keywords": [
     "pyth",

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ async function main() {`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`const newImplementationCode = await getCodeDigestWithoutAddress(`
`198`		`- chain.getRpcUrl(),`
	`198`	`+ chain.getWeb3(),`
`199`	`199`	`newImplementationAddress`
`200`	`200`	`);`
`201`	`201`	`// this should be the same keccak256 of the deployedCode property generated by truffle`