Move to Java 25

Author: jpe7s

gradle/sava.properties

@@ -4,5 +4,5 @@ productDescription=GLAM Instruction Mapper
 developerName="Jim"
 developerId="jpe7s"
 developerEmail="james@glam.systems"
-javaVersion=24
-solanaBOMVersion=24.2.6
+javaVersion=25
+solanaBOMVersion=25.0.1

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -17,16 +17,18 @@
 
 import static systems.comodal.jsoniter.JsonIterator.fieldEquals;
 
-public record ProgramMapConfig(Collection<AccountMeta> programs,
+public record ProgramMapConfig(AccountMeta invokedProxyProgram,
+                               Collection<AccountMeta> programs,
                                List<IxMapConfig> ixMapConfigs,
                                int discriminatorLength) {
 
   public boolean fixedLengthDiscriminator() {
     return discriminatorLength > 0;
   }
 
-  public <A> Collection<ProgramProxy<A>> createProgramProxies(final AccountMeta invokedProxyProgram,
+  public <A> Collection<ProgramProxy<A>> createProgramProxies(final AccountMeta defaultInvokedProxyProgram,
                                                               final Function<DynamicAccountConfig, DynamicAccount<A>> dynamicAccountFactory) {
+    final var invokedProxyProgram = Objects.requireNonNullElse(this.invokedProxyProgram, defaultInvokedProxyProgram);
     if (fixedLengthDiscriminator()) {
       final var ixProxies = HashMap.<Discriminator, IxProxy<A>>newHashMap(ixMapConfigs.size());
       for (final var ixMapConfig : ixMapConfigs) {
@@ -48,12 +50,12 @@ public <A> Collection<ProgramProxy<A>> createProgramProxies(final AccountMeta in
     }
   }
 
-  public static <A> Map<PublicKey, ProgramProxy<A>> createProgramProxies(final AccountMeta invokedProxyProgram,
+  public static <A> Map<PublicKey, ProgramProxy<A>> createProgramProxies(final AccountMeta defaultInvokedProxyProgram,
                                                                          final Function<DynamicAccountConfig, DynamicAccount<A>> dynamicAccountFactory,
                                                                          final List<ProgramMapConfig> programMapConfigs) {
     final var proxies = new HashMap<PublicKey, ProgramProxy<A>>(programMapConfigs.size());
     for (final var programMapConfig : programMapConfigs) {
-      final var programProxies = programMapConfig.createProgramProxies(invokedProxyProgram, dynamicAccountFactory);
+      final var programProxies = programMapConfig.createProgramProxies(defaultInvokedProxyProgram, dynamicAccountFactory);
       for (final var programProxy : programProxies) {
         proxies.put(programProxy.cpiProgram(), programProxy);
       }
@@ -62,7 +64,7 @@ public static <A> Map<PublicKey, ProgramProxy<A>> createProgramProxies(final Acc
   }
 
   public static <A> void createProxies(final Path mappingFile,
-                                       final AccountMeta invokedProxyProgram,
+                                       final AccountMeta defaultInvokedProxyProgram,
                                        final Map<PublicKey, ProgramProxy<A>> programProxiesOutput,
                                        final Function<DynamicAccountConfig, DynamicAccount<A>> dynamicAccountFactory,
                                        final Map<AccountMeta, AccountMeta> accountMetaCache,
@@ -71,7 +73,7 @@ public static <A> void createProxies(final Path mappingFile,
       final var mappingJson = Files.readAllBytes(mappingFile);
       final var ji = JsonIterator.parse(mappingJson);
       final var programMapConfig = ProgramMapConfig.parseConfig(accountMetaCache, indexedAccountMetaCache, ji);
-      final var programProxyCollection = programMapConfig.createProgramProxies(invokedProxyProgram, dynamicAccountFactory);
+      final var programProxyCollection = programMapConfig.createProgramProxies(defaultInvokedProxyProgram, dynamicAccountFactory);
       for (final var proxy : programProxyCollection) {
         programProxiesOutput.put(proxy.cpiProgram(), proxy);
       }
@@ -95,6 +97,7 @@ private static final class Parser implements FieldBufferPredicate {
     private final Map<AccountMeta, AccountMeta> accountMetaCache;
     private final Map<IndexedAccountMeta, IndexedAccountMeta> indexedAccountMetaCache;
 
+    private PublicKey proxyProgram;
     private Collection<AccountMeta> programs;
     private List<IxMapConfig> ixMapConfigs;
 
@@ -105,17 +108,18 @@ private Parser(final Map<AccountMeta, AccountMeta> accountMetaCache,
     }
 
     private ProgramMapConfig create() {
+      final var invokedProxyProgram = proxyProgram == null ? null : AccountMeta.createInvoked(proxyProgram);
       if (ixMapConfigs.isEmpty()) {
-        return new ProgramMapConfig(programs, ixMapConfigs, 0);
+        return new ProgramMapConfig(invokedProxyProgram, programs, ixMapConfigs, 0);
       } else {
         final var iterator = ixMapConfigs.iterator();
         final int discriminatorLength = iterator.next().cpiDiscriminator().length();
         while (iterator.hasNext()) {
           if (iterator.next().cpiDiscriminator().length() != discriminatorLength) {
-            return new ProgramMapConfig(programs, ixMapConfigs, -1);
+            return new ProgramMapConfig(invokedProxyProgram, programs, ixMapConfigs, -1);
           }
         }
-        return new ProgramMapConfig(programs, ixMapConfigs, discriminatorLength);
+        return new ProgramMapConfig(invokedProxyProgram, programs, ixMapConfigs, discriminatorLength);
       }
     }
 
@@ -131,6 +135,8 @@ public boolean test(final char[] buf, final int offset, final int len, final Jso
         } else {
           this.programs = List.of(AccountMeta.createRead(ji.applyChars(PARSE_BASE58_PUBLIC_KEY)));
         }
+      } else if (fieldEquals("proxy_program_id", buf, offset, len)) {
+        this.proxyProgram = ji.applyChars(PARSE_BASE58_PUBLIC_KEY);
       } else if (fieldEquals("instructions", buf, offset, len)) {
         final var ixMapConfigs = new ArrayList<IxMapConfig>();
         while (ji.readArray()) {

gradlew

@@ -10,7 +10,7 @@ pluginManagement {
 }
 
 plugins {
-  id("software.sava.build") version "0.1.27"
+  id("software.sava.build") version "0.2.2"
 }
 
 rootProject.name = "ix-proxy"