Update mappings and dependencies.

Author: jpe7s

downloadMappings.sh

@@ -3,9 +3,9 @@
 set -e
 
 rm -rf glam/
-git clone -n --depth=1 --filter=tree:0 https://github.com/glamsystems/glam-sdk.git glam
+git clone -n --depth=1 --filter=tree:0 https://github.com/glamsystems/ix-mapper-ts.git glam
 cd glam
-git sparse-checkout set --no-cone /remapping /remapping_v1
+git sparse-checkout set --no-cone /mapping-configs-v0 /mapping-configs-v1
 git checkout
 
 cd ..

gradle/sava.properties

@@ -5,4 +5,4 @@ developerName="Jim"
 developerId="jpe7s"
 developerEmail="james@glam.systems"
 javaVersion=25
-solanaBOMVersion=25.0.13
+solanaBOMVersion=25.18.3

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -11,20 +11,8 @@
 import java.util.List;
 import java.util.Map;
 
-final class ProgramProxyMap<A> implements TransactionMapper<A> {
-
-  private final PublicKey invokedProxyProgram;
-  private final Map<PublicKey, ProgramProxy<A>> programProxyMap;
-
-  ProgramProxyMap(final PublicKey invokedProxyProgram, final Map<PublicKey, ProgramProxy<A>> programProxyMap) {
-    this.invokedProxyProgram = invokedProxyProgram;
-    this.programProxyMap = programProxyMap;
-  }
-
-  @Override
-  public PublicKey invokedProxyProgram() {
-    return invokedProxyProgram;
-  }
+record ProgramProxyMap<A>(PublicKey invokedProxyProgram,
+                          Map<PublicKey, ProgramProxy<A>> programProxyMap) implements TransactionMapper<A> {
 
   @Override
   public ProgramProxy<A> programProxy(final PublicKey programId) {

gradlew

@@ -92,7 +92,7 @@ public static <A> TransactionMapper<A> createMapper(final Path mappingFileDirect
   };
 
   private static final TransactionMapper<GlamVaultAccounts> txMapper = createMapper(
-      Path.of("../glam/remapping"),
+      Path.of("../glam/mapping-configs-v0"),
       AccountMeta.createInvoked(GlamIxTests.INVOKED_PROGRAM),
       new HashMap<>(),
       DYNAMIC_ACCOUNT_FACTORY
@@ -111,7 +111,7 @@ private static Collection<ProgramProxy<GlamVaultAccounts>> createProxies(final b
 
   @Test
   void testPayerProxy() throws IOException {
-    final var mappingJson = Files.readAllBytes(Path.of("../glam/remapping/ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL.json"));
+    final var mappingJson = Files.readAllBytes(Path.of("../glam/mapping-configs-v0/ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL.json"));
 
     final var programProxies = createProxies(mappingJson);
     assertEquals(1, programProxies.size());
@@ -128,7 +128,7 @@ void testPayerProxy() throws IOException {
 
   @Test
   void testGlamDriftRemapping() throws IOException {
-    final var mappingJson = Files.readAllBytes(Path.of("../glam/remapping/dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH.json"));
+    final var mappingJson = Files.readAllBytes(Path.of("../glam/mapping-configs-v0/dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH.json"));
 
     final var programProxies = createProxies(mappingJson);
     assertEquals(1, programProxies.size());

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

@@ -1,20 +1,34 @@
+rootProject.name = "ix-proxy"
+
 pluginManagement {
   repositories {
     gradlePluginPortal()
-    maven {
-      name = "savaGithubPackages"
-      url = uri("https://maven.pkg.github.com/sava-software/sava-build")
-      credentials(PasswordCredentials::class)
+    mavenCentral()
+    val gprUser = providers.gradleProperty("savaGithubPackagesUsername")
+      .orElse(providers.environmentVariable("ORG_GRADLE_PROJECT_savaGithubPackagesUsername"))
+      .orElse(providers.environmentVariable("GITHUB_ACTOR"))
+      .orNull
+    val gprToken = providers.gradleProperty("savaGithubPackagesPassword")
+      .orElse(providers.environmentVariable("ORG_GRADLE_PROJECT_savaGithubPackagesPassword"))
+      .orElse(providers.environmentVariable("GITHUB_TOKEN"))
+      .orNull
+    if (!gprUser.isNullOrBlank() && !gprToken.isNullOrBlank()) {
+      maven {
+        url = uri("https://maven.pkg.github.com/sava-software/sava-build")
+        credentials {
+          username = gprUser
+          password = gprToken
+        }
+      }
     }
+    // includeBuild("../sava-build")
   }
 }
 
 plugins {
-  id("software.sava.build") version "0.2.2"
+  id("software.sava.build") version "21.3.10"
 }
 
-rootProject.name = "ix-proxy"
-
 javaModules {
   directory(".") {
     group = "systems.glam"