wormhole-foundation · zpoken · Jan 9, 2025 · Jan 9, 2025
diff --git a/solana/app/StakeConnection.ts b/solana/app/StakeConnection.ts
@@ -39,6 +39,7 @@ import {
 } from "./vote_weight_window_lengths";
 import { signaturesToSolanaArray } from "@wormhole-foundation/wormhole-query-sdk";
 import { deriveGuardianSetKey } from "./helpers/guardianSet";
+import crypto from "crypto";
 
 let wasm = importedWasm;
 export { wasm };
@@ -679,16 +680,29 @@ export class StakeConnection {
   }
 
   /** Post signatures */
-  public async postSignatures(
-    querySignatures: string[],
-    signaturesKeypair: Keypair,
-  ) {
+  public async postSignatures(querySignatures: string[]): Promise<PublicKey> {
     const signatureData = signaturesToSolanaArray(querySignatures);
+    const randomSeed = crypto.randomBytes(32);
+
     await this.program.methods
-      .postSignatures(signatureData, signatureData.length)
-      .accounts({ guardianSignatures: signaturesKeypair.publicKey })
-      .signers([signaturesKeypair])
+      .postSignatures(
+        signatureData,
+        signatureData.length,
+        Array.from(randomSeed),
+      )
+      .accounts({ payer: this.userPublicKey() })
       .rpc();
+
+    const [guardianSignaturesPda] = PublicKey.findProgramAddressSync(
+      [
+        utils.bytes.utf8.encode(wasm.Constants.GUARDIAN_SIGNATURES_SEED()),
+        this.userPublicKey().toBuffer(),
+        randomSeed,
+      ],
+      this.program.programId,
+    );
+
+    return guardianSignaturesPda;
   }
 
   public async addProposal(

diff --git a/solana/app/deploy/bridge-script.ts b/solana/app/deploy/bridge-script.ts
@@ -89,13 +89,12 @@ In Solana:
 1) save signatures in solana account:
   result.signatures: ${result.signatures}
 
-  const signaturesKeypair = Keypair.generate();
   const signatureData = signaturesToSolanaArray(result.signatures);
+  const randomSeed = crypto.randomBytes(32);
 
   program.methods
-    .postSignatures(signatureData, signatureData.length)
-    .accounts({ guardianSignatures: signaturesKeypair.publicKey })
-    .signers([signaturesKeypair])
+    .postSignatures(signatureData, signatureData.length, Array.from(randomSeed))
+    .accounts({ payer: this.userPublicKey() })
     .rpc();
 2) call addProposal instruction:
   const ethProposalResponseBytes = Buffer.from(result.bytes, "hex");
@@ -109,6 +108,15 @@ In Solana:
     program.programId,
   )[0];
 
+  const [guardianSignaturesPda] = await PublicKey.findProgramAddress(
+    [
+      Buffer.from("guardian_signatures"),
+      this.userPublicKey().toBuffer(),
+      randomSeed,
+    ],
+    program.programId
+  );
+
   program.methods
     .addProposal(
       ethProposalResponseBytes,
@@ -117,7 +125,7 @@ In Solana:
     )
     .accountsPartial({
       proposal: proposalAccount,
-      guardianSignatures: signaturesKeypair.publicKey,
+      guardianSignatures: guardianSignaturesPda,
       guardianSet: guardianSet,
     });
 `);

diff --git a/solana/programs/staking/src/context.rs b/solana/programs/staking/src/context.rs
@@ -32,6 +32,7 @@ pub const MESSAGE_RECEIVED: &str = "message_received";
 pub const AIRLOCK_SEED: &str = "airlock";
 pub const SPOKE_METADATA_COLLECTOR_SEED: &str = "spoke_metadata_collector";
 pub const VOTE_WEIGHT_WINDOW_LENGTHS_SEED: &str = "vote_weight_window_lengths";
+pub const GUARDIAN_SIGNATURES_SEED: &str = "guardian_signatures";
 
 #[derive(Accounts)]
 pub struct InitConfig<'info> {
@@ -225,15 +226,17 @@ pub struct UpdateHubProposalMetadata<'info> {
 }
 
 #[derive(Accounts)]
-#[instruction(_guardian_signatures: Vec<[u8; 66]>, total_signatures: u8)]
+#[instruction(_guardian_signatures: Vec<[u8; 66]>, total_signatures: u8, random_seed: [u8; 32])]
 pub struct PostSignatures<'info> {
     #[account(mut)]
     pub payer: Signer<'info>,
 
     #[account(
         init_if_needed,
         payer = payer,
-        space = 8 + GuardianSignatures::compute_size(usize::from(total_signatures))
+        space = 8 + GuardianSignatures::compute_size(usize::from(total_signatures)),
+        seeds = [GUARDIAN_SIGNATURES_SEED.as_bytes(), payer.key().as_ref(), random_seed.as_ref()],
+        bump
     )]
     pub guardian_signatures: Account<'info, GuardianSignatures>,
 

diff --git a/solana/programs/staking/src/lib.rs b/solana/programs/staking/src/lib.rs
@@ -844,6 +844,7 @@ pub mod staking {
         ctx: Context<PostSignatures>,
         guardian_signatures: Vec<[u8; 66]>,
         total_signatures: u8,
+        _random_seed: [u8; 32],
     ) -> Result<()> {
         _post_signatures(ctx, guardian_signatures, total_signatures)
     }

diff --git a/solana/programs/staking/src/wasm.rs b/solana/programs/staking/src/wasm.rs
@@ -177,6 +177,7 @@ reexport_seed_const!(VESTING_BALANCE_SEED);
 reexport_seed_const!(VEST_SEED);
 reexport_seed_const!(SPOKE_METADATA_COLLECTOR_SEED);
 reexport_seed_const!(VOTE_WEIGHT_WINDOW_LENGTHS_SEED);
+reexport_seed_const!(GUARDIAN_SIGNATURES_SEED);
 
 #[wasm_bindgen]
 impl Constants {

diff --git a/solana/tests/api_test.ts b/solana/tests/api_test.ts
@@ -166,15 +166,11 @@ describe("api", async () => {
   });
 
   it("postSignatures", async () => {
-    const signaturesKeypair = Keypair.generate();
-    await stakeConnection.postSignatures(
+    const guardianSignaturesPda = await await stakeConnection.postSignatures(
       ethProposalResponse.signatures,
-      signaturesKeypair,
     );
     const { guardianSignaturesData } =
-      await stakeConnection.fetchGuardianSignaturesData(
-        signaturesKeypair.publicKey,
-      );
+      await stakeConnection.fetchGuardianSignaturesData(guardianSignaturesPda);
     const expectedSignatures = signaturesToSolanaArray(
       ethProposalResponse.signatures,
     );
@@ -196,16 +192,17 @@ describe("api", async () => {
         proposalIdInput,
         voteStart,
       );
-      const signaturesKeypair = Keypair.generate();
+
       const mock = new QueryProxyMock({});
       const mockSignatures = mock.sign(ethProposalResponseBytes);
-      await stakeConnection.postSignatures(mockSignatures, signaturesKeypair);
+      const guardianSignaturesPda =
+        await stakeConnection.postSignatures(mockSignatures);
       const mockGuardianSetIndex = 5;
 
       await stakeConnection.addProposal(
         proposalIdInput,
         ethProposalResponseBytes,
-        signaturesKeypair.publicKey,
+        guardianSignaturesPda,
         mockGuardianSetIndex,
       );
 
@@ -234,16 +231,14 @@ describe("api", async () => {
         "hex",
       );
 
-      const signaturesKeypair = Keypair.generate();
-      await stakeConnection.postSignatures(
+      const guardianSignaturesPda = await stakeConnection.postSignatures(
         sepoliaEthProposalResponse.signatures,
-        signaturesKeypair,
       );
 
       await stakeConnection.addProposal(
         proposalIdArray,
         Buffer.from(sepoliaEthProposalResponse.bytes, "hex"),
-        signaturesKeypair.publicKey,
+        guardianSignaturesPda,
         0,
       );
 
@@ -276,17 +271,17 @@ describe("api", async () => {
           voteStart,
         );
 
-      const signaturesKeypair = Keypair.generate();
       const mock = new QueryProxyMock({});
       const mockSignatures = mock.sign(nonFinalizedEthProposalResponseBytes);
-      await stakeConnection.postSignatures(mockSignatures, signaturesKeypair);
+      const guardianSignaturesPda =
+        await stakeConnection.postSignatures(mockSignatures);
       const mockGuardianSetIndex = 5;
 
       try {
         await stakeConnection.addProposal(
           proposalIdInput,
           nonFinalizedEthProposalResponseBytes,
-          signaturesKeypair.publicKey,
+          guardianSignaturesPda,
           mockGuardianSetIndex,
           true,
         );
@@ -312,17 +307,17 @@ describe("api", async () => {
           voteStart,
         );
 
-      const signaturesKeypair = Keypair.generate();
       const mock = new QueryProxyMock({});
       const mockSignatures = mock.sign(invalidQueryEthProposalResponseBytes);
-      await stakeConnection.postSignatures(mockSignatures, signaturesKeypair);
+      const guardianSignaturesPda =
+        await stakeConnection.postSignatures(mockSignatures);
       const mockGuardianSetIndex = 5;
 
       try {
         await stakeConnection.addProposal(
           proposalIdInput,
           invalidQueryEthProposalResponseBytes,
-          signaturesKeypair.publicKey,
+          guardianSignaturesPda,
           mockGuardianSetIndex,
           true,
         );
@@ -349,17 +344,17 @@ describe("api", async () => {
           voteStart,
         );
 
-      const signaturesKeypair = Keypair.generate();
       const mock = new QueryProxyMock({});
       const mockSignatures = mock.sign(invalidResponseEthProposalResponseBytes);
-      await stakeConnection.postSignatures(mockSignatures, signaturesKeypair);
+      const guardianSignaturesPda =
+        await stakeConnection.postSignatures(mockSignatures);
       const mockGuardianSetIndex = 5;
 
       try {
         await stakeConnection.addProposal(
           proposalIdInput,
           invalidResponseEthProposalResponseBytes,
-          signaturesKeypair.publicKey,
+          guardianSignaturesPda,
           mockGuardianSetIndex,
           true,
         );
@@ -386,19 +381,19 @@ describe("api", async () => {
           voteStart,
         );
 
-      const signaturesKeypair = Keypair.generate();
       const mock = new QueryProxyMock({});
       const mockSignatures = mock.sign(
         invalidFunctionSignatureEthProposalResponseBytes,
       );
-      await stakeConnection.postSignatures(mockSignatures, signaturesKeypair);
+      const guardianSignaturesPda =
+        await stakeConnection.postSignatures(mockSignatures);
       const mockGuardianSetIndex = 5;
 
       try {
         await stakeConnection.addProposal(
           proposalIdInput,
           invalidFunctionSignatureEthProposalResponseBytes,
-          signaturesKeypair.publicKey,
+          guardianSignaturesPda,
           mockGuardianSetIndex,
           true,
         );
@@ -422,17 +417,17 @@ describe("api", async () => {
         proposalIdInput,
         voteStart,
       );
-      const signaturesKeypair = Keypair.generate();
       const mock = new QueryProxyMock({});
       const mockSignatures = mock.sign(ethProposalResponseBytes);
-      await stakeConnection.postSignatures(mockSignatures, signaturesKeypair);
+      const guardianSignaturesPda =
+        await stakeConnection.postSignatures(mockSignatures);
       const mockGuardianSetIndex = 5;
 
       try {
         await stakeConnection.addProposal(
           proposalIdInput,
           ethProposalResponseBytes,
-          signaturesKeypair.publicKey,
+          guardianSignaturesPda,
           mockGuardianSetIndex,
           true,
         );
@@ -457,17 +452,17 @@ describe("api", async () => {
         proposalIdInput,
         voteStart,
       );
-      const signaturesKeypair = Keypair.generate();
       const mock = new QueryProxyMock({});
       const mockSignatures = mock.sign(ethProposalResponseBytes);
-      await stakeConnection.postSignatures(mockSignatures, signaturesKeypair);
+      const guardianSignaturesPda =
+        await stakeConnection.postSignatures(mockSignatures);
       const mockGuardianSetIndex = 5;
 
       try {
         await stakeConnection.addProposal(
           proposalIdInput,
           ethProposalResponseBytes,
-          signaturesKeypair.publicKey,
+          guardianSignaturesPda,
           mockGuardianSetIndex,
           true,
         );
@@ -493,16 +488,16 @@ describe("api", async () => {
       proposalIdInput,
       voteStart,
     );
-    const signaturesKeypair = Keypair.generate();
     const mock = new QueryProxyMock({});
     const mockSignatures = mock.sign(ethProposalResponseBytes);
-    await stakeConnection.postSignatures(mockSignatures, signaturesKeypair);
+    const guardianSignaturesPda =
+      await stakeConnection.postSignatures(mockSignatures);
     const mockGuardianSetIndex = 5;
 
     await stakeConnection.addProposal(
       proposalIdInput,
       ethProposalResponseBytes,
-      signaturesKeypair.publicKey,
+      guardianSignaturesPda,
       mockGuardianSetIndex,
     );
 
@@ -1210,16 +1205,16 @@ async function addTestProposal(
     proposalIdInput,
     voteStart,
   );
-  const signaturesKeypair = Keypair.generate();
   const mock = new QueryProxyMock({});
   const mockSignatures = mock.sign(ethProposalResponseBytes);
-  await stakeConnection.postSignatures(mockSignatures, signaturesKeypair);
+  const guardianSignaturesPda =
+    await stakeConnection.postSignatures(mockSignatures);
   const mockGuardianSetIndex = 5;
 
   await stakeConnection.addProposal(
     proposalIdInput,
     ethProposalResponseBytes,
-    signaturesKeypair.publicKey,
+    guardianSignaturesPda,
     mockGuardianSetIndex,
   );