don't take the payer as a parameter to the SolanaInnerTransactionBuil…

…der constructor - use the builder pattern instead to later add a payer
LMAX-Exchange · Jun 25, 2024 · 9d94232 · 9d94232
1 parent 563ca22
commit 9d94232
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/src/main/java/com/lmax/solana4j/Solana.java b/src/main/java/com/lmax/solana4j/Solana.java
@@ -28,9 +28,9 @@ public static MessageBuilder builder(final ByteBuffer buffer)
         return SolanaEncoding.builder(buffer);
     }
 
-    public static InnerTransactionBuilder innerTxBuilder(final PublicKey payer)
+    public static InnerTransactionBuilder innerTxBuilder()
     {
-        return SolanaEncoding.innerTxBuilder(payer);
+        return SolanaEncoding.innerTxBuilder();
     }
 
     public static SignedMessageBuilder forSigning(final ByteBuffer message)

diff --git a/src/main/java/com/lmax/solana4j/api/InnerTransactionBuilder.java b/src/main/java/com/lmax/solana4j/api/InnerTransactionBuilder.java
@@ -6,5 +6,7 @@ public interface InnerTransactionBuilder
 {
     InnerTransactionBuilder instructions(Consumer<TransactionBuilder> builder);
 
+    InnerTransactionBuilder payer(PublicKey payer);
+
     InnerInstructions build();
 }
diff --git a/src/main/java/com/lmax/solana4j/encoding/SolanaEncoding.java b/src/main/java/com/lmax/solana4j/encoding/SolanaEncoding.java
@@ -26,9 +26,9 @@ public static MessageBuilder builder(final ByteBuffer buffer)
         return new SolanaMessageBuilder(buffer);
     }
 
-    public static InnerTransactionBuilder innerTxBuilder(final PublicKey payer)
+    public static InnerTransactionBuilder innerTxBuilder()
     {
-        return new SolanaInnerTransactionBuilder(payer);
+        return new SolanaInnerTransactionBuilder();
     }
 
     public static SignedMessageBuilder forSigning(final ByteBuffer message)

diff --git a/src/main/java/com/lmax/solana4j/encoding/SolanaInnerTransactionBuilder.java b/src/main/java/com/lmax/solana4j/encoding/SolanaInnerTransactionBuilder.java
@@ -21,12 +21,7 @@ public class SolanaInnerTransactionBuilder implements InnerTransactionBuilder
 {
     private final List<TransactionInstruction> innerInstructions = new ArrayList<>();
 
-    private final TransactionInstruction.AccountReference payerReference;
-
-    public SolanaInnerTransactionBuilder(final PublicKey payer)
-    {
-        this.payerReference = new SolanaAccountReference(payer, true, true, false);
-    }
+    private TransactionInstruction.AccountReference payerReference = new SolanaAccountReference(Solana.account(new byte[32]), true, true, false);
 
     @Override
     public InnerTransactionBuilder instructions(final Consumer<TransactionBuilder> builder)
@@ -36,6 +31,13 @@ public InnerTransactionBuilder instructions(final Consumer<TransactionBuilder> b
         return this;
     }
 
+    @Override
+    public InnerTransactionBuilder payer(final PublicKey payer)
+    {
+        payerReference = new SolanaAccountReference(payer, true, true, false);
+        return this;
+    }
+
     @Override
     public InnerInstructions build()
     {