handle new token context fields.

sava-software · Sep 18, 2024 · 06b76b5 · 06b76b5
1 parent 00d8fe5
commit 06b76b5
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 6 deletions.
diff --git a/src/main/java/software/sava/solana/web2/jupiter/client/http/JupiterHttpClient.java b/src/main/java/software/sava/solana/web2/jupiter/client/http/JupiterHttpClient.java
@@ -55,6 +55,12 @@ final class JupiterHttpClient extends JsonHttpClient implements JupiterClient {
     return programLabels;
   });
 
+
+  public static void main(String[] args) {
+    final var client = JupiterClient.createClient(HttpClient.newHttpClient());
+    final var tokens = client.verifiedTokenMap().join();
+  }
+
   private static final Function<HttpResponse<byte[]>, List<MarketRecord>> MARKET_CACHE_PARSER = applyResponse(MarketRecord::parse);
 
   private final URI tokensEndpoint;

diff --git a/src/main/java/software/sava/solana/web2/jupiter/client/http/response/TokenContext.java b/src/main/java/software/sava/solana/web2/jupiter/client/http/response/TokenContext.java
@@ -8,10 +8,8 @@
 import systems.comodal.jsoniter.JsonIterator;
 
 import java.math.BigDecimal;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
+import java.time.Instant;
+import java.util.*;
 
 import static java.lang.System.Logger.Level.WARNING;
 import static software.sava.rpc.json.PublicKeyEncoding.parseBase58Encoded;
@@ -26,7 +24,11 @@ public record TokenContext(PublicKey address,
                            Set<JupiterTokenTag> tags,
                            BigDecimal dailyVolume,
                            PublicKey freezeAuthority,
-                           PublicKey mintAuthority) implements DecimalInteger {
+                           PublicKey mintAuthority,
+                           PublicKey permanentDelegate,
+                           Instant createdAt,
+                           Instant mintedAt,
+                           Map<TokenExtension, String> extensions) implements DecimalInteger {
 
   private static final System.Logger log = System.getLogger(TokenContext.class.getName());
 
@@ -101,6 +103,30 @@ public static Map<PublicKey, TokenContext> parseList(final JsonIterator ji) {
       builder.freezeAuthority = parseBase58Encoded(ji);
     } else if (fieldEquals("mint_authority", buf, offset, len)) {
       builder.mintAuthority = parseBase58Encoded(ji);
+    } else if (fieldEquals("permanent_delegate", buf, offset, len)) {
+      builder.permanentDelegate = parseBase58Encoded(ji);
+    } else if (fieldEquals("extensions", buf, offset, len)) {
+      final var extensions = new EnumMap<TokenExtension, String>(TokenExtension.class);
+      for (String extension, value; (extension = ji.readObjField()) != null; ) {
+        value = ji.readString();
+        try {
+          extensions.put(TokenExtension.valueOf(extension), value);
+        } catch (final RuntimeException ex) {
+          log.log(WARNING,
+              "Failed to parse unknown Jupiter token extension [{0}={1}].", extension, value);
+        }
+      }
+      builder.extensions = extensions;
+    } else if (fieldEquals("created_at", buf, offset, len)) {
+      final var createdAt = ji.readString();
+      if (createdAt != null) {
+        builder.createdAt = Instant.parse(createdAt);
+      }
+    } else if (fieldEquals("minted_at", buf, offset, len)) {
+      final var mintedAt = ji.readString();
+      if (mintedAt != null) {
+        builder.mintedAt = Instant.parse(mintedAt);
+      }
     } else {
       ji.skip();
       log.log(WARNING,
@@ -122,6 +148,10 @@ private static final class Builder {
     private BigDecimal dailyVolume;
     private PublicKey freezeAuthority;
     private PublicKey mintAuthority;
+    private PublicKey permanentDelegate;
+    private Instant createdAt;
+    private Instant mintedAt;
+    private Map<TokenExtension, String> extensions;
 
     private Builder() {
     }
@@ -132,7 +162,11 @@ private TokenContext create() {
           tags == null || tags.isEmpty() ? NO_TAGS : tags,
           dailyVolume,
           freezeAuthority,
-          mintAuthority
+          mintAuthority,
+          permanentDelegate,
+          createdAt,
+          mintedAt,
+          extensions
       );
     }
   }