Add proxy program to DynamicAccount interface.

Author: jpe7s

downloadMappings.sh

@@ -5,7 +5,7 @@ set -e
 rm -rf glam/
 git clone -n --depth=1 --filter=tree:0 https://github.com/glamsystems/glam-sdk.git glam
 cd glam
-git sparse-checkout set --no-cone /remapping
+git sparse-checkout set --no-cone /remapping /remapping_v1
 git checkout
 
 cd ..

ix-proxy/src/main/java/systems/glam/ix/proxy/DynamicAccount.java

@@ -1,11 +1,13 @@
 package systems.glam.ix.proxy;
 
+import software.sava.core.accounts.PublicKey;
 import software.sava.core.accounts.meta.AccountMeta;
 
 @FunctionalInterface
 public interface DynamicAccount<A> {
 
   void setAccount(final AccountMeta[] mappedAccounts,
+                  final PublicKey proxyProgram,
                   final AccountMeta cpiProgram,
                   final AccountMeta feePayer,
                   final A runtimeAccounts);

ix-proxy/src/main/java/systems/glam/ix/proxy/IndexedCpiProgram.java

@@ -1,11 +1,13 @@
 package systems.glam.ix.proxy;
 
+import software.sava.core.accounts.PublicKey;
 import software.sava.core.accounts.meta.AccountMeta;
 
 public record IndexedCpiProgram<A>(int index) implements DynamicAccount<A> {
 
   @Override
   public void setAccount(final AccountMeta[] mappedAccounts,
+                         final PublicKey proxyProgram,
                          final AccountMeta cpiProgram,
                          final AccountMeta feePayer,
                          final A runtimeAccounts) {

ix-proxy/src/main/java/systems/glam/ix/proxy/IndexedFeePayer.java

@@ -1,11 +1,13 @@
 package systems.glam.ix.proxy;
 
+import software.sava.core.accounts.PublicKey;
 import software.sava.core.accounts.meta.AccountMeta;
 
 public record IndexedFeePayer<A>(int index) implements DynamicAccount<A> {
 
   @Override
   public void setAccount(final AccountMeta[] mappedAccounts,
+                         final PublicKey proxyProgram,
                          final AccountMeta cpiProgram,
                          final AccountMeta feePayer,
                          final A runtimeAccounts) {

ix-proxy/src/main/java/systems/glam/ix/proxy/IxMapConfig.java

@@ -69,7 +69,7 @@ public <A> IxProxy<A> createProxy(final AccountMeta invokedProxyProgram,
         if (checkIndexes[index]) {
           throw new IllegalStateException(String.format(
               "Duplicate index %d in dynamic accounts. CPI IX: %s, Proxy IX: %s",
-              account.index(), cpiIxName, proxyIxName
+              index, cpiIxName, proxyIxName
           ));
         } else {
           checkIndexes[index] = true;
@@ -80,7 +80,7 @@ public <A> IxProxy<A> createProxy(final AccountMeta invokedProxyProgram,
         if (checkIndexes[index]) {
           throw new IllegalStateException(String.format(
               "Duplicate index %d in static accounts. CPI IX: %s, Proxy IX: %s",
-              account.index(), cpiIxName, proxyIxName
+              index, cpiIxName, proxyIxName
           ));
         } else {
           checkIndexes[index] = true;

ix-proxy/src/main/java/systems/glam/ix/proxy/IxProxyRecord.java

@@ -45,7 +45,13 @@ public Instruction mapInstructionUnchecked(final AccountMeta readCpiProgram,
 
     final var mappedAccounts = new AccountMeta[this.numAccounts + numExtraAccounts];
     for (final var dynamicAccount : dynamicAccounts) {
-      dynamicAccount.setAccount(mappedAccounts, readCpiProgram, feePayer, runtimeAccounts);
+      dynamicAccount.setAccount(
+          mappedAccounts,
+          invokedProxyProgram.publicKey(),
+          readCpiProgram,
+          feePayer,
+          runtimeAccounts
+      );
     }
     for (final var staticAccount : staticAccounts) {
       staticAccount.setAccount(mappedAccounts);

ix-proxy/src/test/java/systems/glam/ix/proxy/GlamIxTests.java

@@ -81,9 +81,9 @@ public static <A> TransactionMapper<A> createMapper(final Path mappingFileDirect
     final int index = accountConfig.index();
     final boolean w = accountConfig.writable();
     return switch (accountConfig.name()) {
-      case "glam_state" -> (mappedAccounts, _, _, vaultAccounts) -> mappedAccounts[index] = w
+      case "glam_state" -> (mappedAccounts, _, _, _, vaultAccounts) -> mappedAccounts[index] = w
           ? vaultAccounts.writeGlamState() : vaultAccounts.readGlamState();
-      case "glam_vault" -> (mappedAccounts, _, _, vaultAccounts) -> mappedAccounts[index] = w
+      case "glam_vault" -> (mappedAccounts, _, _, _, vaultAccounts) -> mappedAccounts[index] = w
           ? vaultAccounts.writeGlamVault() : vaultAccounts.readGlamVault();
       case "glam_signer" -> accountConfig.createFeePayerAccount();
       case "cpi_program" -> accountConfig.createReadCpiProgram();