Add locked voter new escrow.

sava-software · Nov 20, 2024 · 2e63feb · 2e63feb
1 parent e4e7f03
commit 2e63feb
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/programs/src/main/java/software/sava/anchor/programs/jupiter/voter/JupiterVoteClient.java b/programs/src/main/java/software/sava/anchor/programs/jupiter/voter/JupiterVoteClient.java
@@ -43,14 +43,18 @@ default CompletableFuture<List<AccountInfo<Proposal>>> fetchProposals(final Sola
     final var accounts = jupiterAccounts();
     final var governorKey = accounts.deriveGovernor().publicKey();
     return rpcClient.getProgramAccounts(
-        jupiterAccounts().voteProgram(),
-        List.of(
-            Proposal.createGovernorFilter(governorKey)
-        ),
+        jupiterAccounts().govProgram(),
+        List.of(Proposal.createGovernorFilter(governorKey)),
         Proposal.FACTORY
     );
   }
 
+  Instruction newEscrow(final PublicKey escrowOwnerKey, final PublicKey payer);
+
+  default Instruction newEscrow(final PublicKey escrowOwnerKey) {
+    return newEscrow(escrowOwnerKey, escrowOwnerKey);
+  }
+
   Instruction newVote(final PublicKey proposal,
                       final PublicKey payer,
                       final PublicKey voter);

diff --git a/...rams/src/main/java/software/sava/anchor/programs/jupiter/voter/JupiterVoteClientImpl.java b/...rams/src/main/java/software/sava/anchor/programs/jupiter/voter/JupiterVoteClientImpl.java
@@ -29,6 +29,20 @@ public JupiterAccounts jupiterAccounts() {
     return accounts;
   }
 
+  @Override
+  public Instruction newEscrow(final PublicKey escrowOwnerKey, final PublicKey payer) {
+    final var lockerKey = accounts.deriveJupLocker().publicKey();
+    final var escrowKey = accounts.deriveEscrow(lockerKey, escrowOwnerKey).publicKey();
+    return LockedVoterProgram.newEscrow(
+        accounts.invokedGovProgram(),
+        lockerKey,
+        escrowKey,
+        escrowOwnerKey,
+        payer,
+        solanaAccounts.systemProgram()
+    );
+  }
+
   @Override
   public Instruction newVote(final PublicKey proposal,
                              final PublicKey payer,

diff --git a/settings.gradle b/settings.gradle
@@ -25,7 +25,7 @@ dependencyResolutionManagement {
   }
   versionCatalogs {
     libs {
-      from("software.sava:solana-version-catalog:0.2.88")
+      from("software.sava:solana-version-catalog:0.2.90")
     }
   }
 }