tempo

Author: aditya520

contract_manager/scripts/check_proposal.ts

@@ -7,7 +7,7 @@
 
 import { createHash } from "node:crypto";
 
-import NodeWallet from "@coral-xyz/anchor/dist/cjs/nodewallet";
+import { Wallet } from "@coral-xyz/anchor";
 import type { PythCluster } from "@pythnetwork/client/lib/cluster";
 import { getPythClusterApiUrl } from "@pythnetwork/client/lib/cluster";
 import {
@@ -21,7 +21,7 @@ import {
 } from "@pythnetwork/xc-admin-common";
 import type { AccountMeta } from "@solana/web3.js";
 import { Keypair, PublicKey } from "@solana/web3.js";
-import SquadsMesh from "@sqds/mesh";
+import SquadsMeshClass from "@sqds/mesh";
 import Web3 from "web3";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
@@ -32,9 +32,16 @@ import {
   EvmPriceFeedContract,
   getCodeDigestWithoutAddress,
   EvmWormholeContract,
+  EvmLazerContract,
 } from "../src/core/contracts/evm";
 import { DefaultStore } from "../src/node/utils/store";
 
+function getSquadsMesh() {
+  // Handle nested default export from @sqds/mesh
+  return (SquadsMeshClass as { default?: typeof SquadsMeshClass }).default ??
+    SquadsMeshClass;
+}
+
 const parser = yargs(hideBin(process.argv))
   .usage("Usage: $0 --cluster <cluster_id> --proposal <proposal_address>")
   .options({
@@ -48,14 +55,21 @@ const parser = yargs(hideBin(process.argv))
       demandOption: true,
       desc: "The proposal address to check",
     },
+    "contract-type": {
+      type: "string",
+      demandOption: false,
+      desc: "Type of EVM contract to verify (entropy or lazer). Required when checking EvmExecute instructions.",
+      choices: ["entropy", "lazer"],
+    },
   });
 
 async function main() {
   const argv = await parser.argv;
   const cluster = argv.cluster as PythCluster;
-  const squad = SquadsMesh.endpoint(
+  const mesh = getSquadsMesh();
+  const squad = mesh.endpoint(
     getPythClusterApiUrl(cluster),
-    new NodeWallet(Keypair.generate()), // dummy wallet
+    new Wallet(Keypair.generate()), // dummy wallet
   );
   const transaction = await squad.getTransaction(new PublicKey(argv.proposal));
   const instructions = await getProposalInstructions(squad, transaction);
@@ -148,7 +162,7 @@ async function main() {
       if (instruction.governanceAction instanceof EvmExecute) {
         // Note: it only checks for upgrade entropy contracts right now
         console.log(
-          `Verifying EVMExecute on ${instruction.governanceAction.targetChainId}`,
+          `\nVerifying EVMExecute on ${instruction.governanceAction.targetChainId}`,
         );
         for (const chain of Object.values(DefaultStore.chains)) {
           if (
@@ -161,9 +175,13 @@ async function main() {
             const callAddress = instruction.governanceAction.callAddress;
             const calldata = instruction.governanceAction.calldata;
 
-            // TODO: If we add additional EVM contracts using the executor, we need to
-            // add some logic here to identify what kind of contract is at the call address.
-            const contract = new EvmEntropyContract(chain, callAddress);
+            // Get contract type from flag, default to "entropy" for backward compatibility
+            const contractType = argv["contract-type"] ?? "entropy";
+
+            const contract: EvmEntropyContract | EvmLazerContract =
+              contractType === "lazer"
+                ? new EvmLazerContract(chain, callAddress)
+                : new EvmEntropyContract(chain, callAddress);
             const owner = await contract.getOwner();
 
             if (

contract_manager/src/core/contracts/evm.ts

@@ -29,23 +29,43 @@ import { WormholeContract } from "./wormhole";
 
 /**
  * Returns the keccak256 digest of the contract bytecode at the given address after replacing
- * any occurrences of the contract addr in the bytecode with 0.The bytecode stores the deployment
- * address as an immutable variable. This behavior is inherited from OpenZeppelin's implementation
- * of UUPSUpgradeable contract. You can read more about verification with immutable variables here:
- * https://docs.sourcify.dev/docs/immutables/
+ * any occurrences of the contract addr in the bytecode with 0 and removing the metadata hash.
+ * The bytecode stores the deployment address as an immutable variable. This behavior is inherited
+ * from OpenZeppelin's implementation of UUPSUpgradeable contract. You can read more about
+ * verification with immutable variables here: https://docs.sourcify.dev/docs/immutables/
+ *
+ * The metadata hash (last 53 bytes) is removed to allow comparison of functional bytecode only,
+ * as metadata can differ between builds even when the contract logic is identical.
+ *
  * This function can be used to verify that the contract code is the same on all chains and matches
- * with the deployedCode property generated by truffle builds
+ * with the deployedCode property generated by truffle builds (excluding metadata).
  */
 export async function getCodeDigestWithoutAddress(
   web3: Web3,
   address: string,
 ): Promise<string> {
   const code = await web3.eth.getCode(address);
-  const strippedCode = code.replaceAll(
+  // Remove 0x prefix for processing
+  const codeWithoutPrefix = code.replace("0x", "");
+  
+  // Strip address occurrences (40 hex chars = 20 bytes)
+  const strippedCode = codeWithoutPrefix.replaceAll(
     address.toLowerCase().replace("0x", ""),
     "0000000000000000000000000000000000000000",
   );
-  return Web3.utils.keccak256(strippedCode);
+  
+  // Remove metadata hash (last 53 bytes = 106 hex characters)
+  // Metadata format: 0xa2 0x64 'i' 'p' 'f' 's' 0x58 0x20 <32 bytes hash>
+  // Total: 53 bytes including CBOR encoding
+  // Only remove if bytecode is long enough (at least 106 hex chars = 53 bytes)
+  const METADATA_LENGTH_HEX = 106; // 53 bytes * 2 hex chars per byte
+  const functionalBytecode =
+    strippedCode.length > METADATA_LENGTH_HEX
+      ? strippedCode.slice(0, -METADATA_LENGTH_HEX)
+      : strippedCode;
+  
+  // Add 0x prefix back for keccak256
+  return Web3.utils.keccak256(`0x${functionalBytecode}`);
 }
 
 export class EvmWormholeContract extends WormholeContract {

contract_manager/src/node/utils/governance.ts

@@ -282,7 +282,9 @@ export class WormholeMultisigProposal {
 type SquadsMeshInstance = InstanceType<typeof SquadsMeshClass>;
 
 function getSquadsMesh() {
-  return SquadsMeshClass;
+  // Handle nested default export from @sqds/mesh
+  return (SquadsMeshClass as { default?: typeof SquadsMeshClass }).default ??
+    SquadsMeshClass;
 }
 
 export class Vault extends Storable {

governance/xc_admin/packages/xc_admin_common/src/chains.ts

@@ -120,7 +120,7 @@ export const RECEIVER_CHAINS = {
   zero_gravity: 60088,
   itsnotreal: 60089, // Deprecated
   plasma: 60090,
-  itsnotreal2: 60091,
+  ethereal: 60091,
   injective_evm: 60092,
   orange: 60093,