[xc-admin] Add wormhole logic to the crank-executor

governance/xc-admin/packages/crank-executor/package.json

@@ -18,6 +18,7 @@
     "format": "prettier --write \"src/**/*.ts\""
   },
   "dependencies": {
+    "@certusone/wormhole-sdk": "^0.9.9",
     "@coral-xyz/anchor": "^0.26.0",
     "@pythnetwork/client": "^2.9.0",
     "@solana/web3.js": "^1.73.0",

governance/xc-admin/packages/crank-executor/src/index.ts

@@ -1,21 +1,31 @@
 import {
+  AccountMeta,
   Commitment,
   Connection,
   Keypair,
   PublicKey,
   SendTransactionError,
+  SystemProgram,
   Transaction,
 } from "@solana/web3.js";
 import SquadsMesh, { DEFAULT_MULTISIG_PROGRAM_ID, getIxPDA } from "@sqds/mesh";
 import * as fs from "fs";
 import NodeWallet from "@project-serum/anchor/dist/cjs/nodewallet";
-import { getProposals } from "xc-admin-common";
+import {
+  getProposals,
+  MultisigParser,
+  WormholeMultisigInstruction,
+} from "xc-admin-common";
 import BN from "bn.js";
 import { AnchorProvider } from "@project-serum/anchor";
 import {
   getPythClusterApiUrl,
   PythCluster,
 } from "@pythnetwork/client/lib/cluster";
+import {
+  deriveFeeCollectorKey,
+  getWormholeBridgeData,
+} from "@certusone/wormhole-sdk/lib/cjs/solana/wormhole";
 
 export function envOrErr(env: string): string {
   const val = process.env[env];
@@ -42,6 +52,15 @@ async function run() {
     wallet: new NodeWallet(KEYPAIR),
     multisigProgramId: DEFAULT_MULTISIG_PROGRAM_ID,
   });
+  const multisigParser = MultisigParser.fromCluster(CLUSTER as PythCluster);
+  const wormholeFee = (
+    await getWormholeBridgeData(
+      squad.connection,
+      multisigParser.wormholeBridgeAddress!,
+      COMMITMENT
+    )
+  ).config.fee;
+
   const proposals = await getProposals(squad, VAULT, undefined, "executeReady");
   for (const proposal of proposals) {
     // If we have previously cancelled because the proposal was failing, don't attempt
@@ -51,7 +70,35 @@ async function run() {
         i <= proposal.instructionIndex;
         i++
       ) {
-        const transaction = new Transaction().add(
+        const instructionPda = getIxPDA(
+          proposal.publicKey,
+          new BN(i),
+          squad.multisigProgramId
+        )[0];
+        const instruction = await squad.getInstruction(instructionPda);
+        const parsedInstruction = multisigParser.parseInstruction({
+          programId: instruction.programId,
+          data: instruction.data as Buffer,
+          keys: instruction.keys as AccountMeta[],
+        });
+        const transaction = new Transaction();
+
+        if (
+          parsedInstruction instanceof WormholeMultisigInstruction &&
+          parsedInstruction.name == "postMessage"
+        ) {
+          transaction.add(
+            SystemProgram.transfer({
+              lamports: wormholeFee,
+              toPubkey: deriveFeeCollectorKey(
+                multisigParser.wormholeBridgeAddress!
+              ),
+              fromPubkey: squad.wallet.publicKey,
+            })
+          );
+        }
+
+        transaction.add(
           await squad.buildExecuteInstruction(
             proposal.publicKey,
             getIxPDA(proposal.publicKey, new BN(i), squad.multisigProgramId)[0]

governance/xc-admin/packages/xc-admin-common/src/multisig_transaction/index.ts

@@ -65,3 +65,6 @@ export class MultisigParser {
     }
   }
 }
+
+export { WormholeMultisigInstruction } from "./WormholeMultisigInstruction";
+export { PythMultisigInstruction } from "./PythMultisigInstruction";

governance/xc-admin/packages/xc-admin-common/src/propose.ts

@@ -3,12 +3,17 @@ import {
   PublicKey,
   Transaction,
   TransactionInstruction,
+  SYSVAR_RENT_PUBKEY,
+  SYSVAR_CLOCK_PUBKEY,
+  SystemProgram,
 } from "@solana/web3.js";
 import { BN } from "bn.js";
 import { AnchorProvider } from "@project-serum/anchor";
 import {
   createWormholeProgramInterface,
-  getPostMessageAccounts,
+  deriveWormholeBridgeDataKey,
+  deriveEmitterSequenceKey,
+  deriveFeeCollectorKey,
 } from "@certusone/wormhole-sdk/lib/cjs/solana/wormhole";
 import { ExecutePostedVaa } from "./governance_payload/ExecutePostedVaa";
 
@@ -36,7 +41,6 @@ export async function proposeInstructions(
 ): Promise<PublicKey> {
   const msAccount = await squad.getMultisig(vault);
   let txToSend: Transaction[] = [];
-
   const createProposal = new Transaction().add(
     await squad.buildCreateTransaction(
       msAccount.publicKey,
@@ -61,7 +65,7 @@ export async function proposeInstructions(
         vault,
         newProposalAddress,
         instructions[i],
-        i,
+        i + 1,
         wormholeAddress
       );
       txToSend.push(
@@ -134,7 +138,7 @@ export async function wrapAsRemoteInstruction(
   instructionIndex: number,
   wormholeAddress: PublicKey
 ): Promise<SquadInstruction> {
-  const emitter = squad.getAuthorityPDA(vault, 0);
+  const emitter = squad.getAuthorityPDA(vault, 1);
 
   const [messagePDA, messagePdaBump] = getIxAuthorityPDA(
     proposalAddress,
@@ -156,12 +160,7 @@ export async function wrapAsRemoteInstruction(
     instruction,
   ]).encode();
 
-  const accounts = getPostMessageAccounts(
-    wormholeAddress,
-    emitter,
-    emitter,
-    messagePDA
-  );
+  const accounts = getPostMessageAccounts(wormholeAddress, emitter, messagePDA);
 
   return {
     instruction: await wormholeProgram.methods
@@ -173,3 +172,20 @@ export async function wrapAsRemoteInstruction(
     authorityType: "custom",
   };
 }
+function getPostMessageAccounts(
+  wormholeAddress: PublicKey,
+  emitter: PublicKey,
+  message: PublicKey
+) {
+  return {
+    bridge: deriveWormholeBridgeDataKey(wormholeAddress),
+    message,
+    emitter,
+    sequence: deriveEmitterSequenceKey(emitter, wormholeAddress),
+    payer: emitter,
+    feeCollector: deriveFeeCollectorKey(wormholeAddress),
+    clock: SYSVAR_CLOCK_PUBKEY,
+    rent: SYSVAR_RENT_PUBKEY,
+    systemProgram: SystemProgram.programId,
+  };
+}