check if versioned tx has lookup tables.

sava-software · Oct 10, 2024 · 251593d · 251593d
1 parent 866c1a7
commit 251593d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/examples/src/main/java/software/sava/anchor/program/examples/PageMeteoraTransactions.java b/examples/src/main/java/software/sava/anchor/program/examples/PageMeteoraTransactions.java
@@ -23,9 +23,7 @@ public static void main(final String[] args) throws InterruptedException {
 
       final int pageLimit = 100;
       long beginRequest = System.currentTimeMillis();
-      var signaturesFuture = rpcClient.getSignaturesForAddress(
-          meteoraProgramId, pageLimit
-      );
+      var signaturesFuture = rpcClient.getSignaturesForAddress(meteoraProgramId, pageLimit);
 
       for (long minMillisBetweenRequests = 5_000; ; ) {
         final var signatures = signaturesFuture.join();

diff --git a/...src/main/java/software/sava/anchor/program/examples/ParseDriftPlaceOrdersTransaction.java b/...src/main/java/software/sava/anchor/program/examples/ParseDriftPlaceOrdersTransaction.java
@@ -42,21 +42,26 @@ public static void main(final String[] args) {
 
       final Instruction[] instructions;
       if (skeleton.isLegacy()) {
-        instructions = skeleton.parseInstructions(skeleton.parseAccounts());
+        instructions = skeleton.parseLegacyInstructions();
       } else {
         // Fetch Lookup tables to allow parsing of versioned transactions.
         final int txVersion = skeleton.version();
         if (txVersion == 0) {
-          final var tableAccountInfos = rpcClient.getMultipleAccounts(
-              Arrays.asList(skeleton.lookupTableAccounts()),
-              AddressLookupTable.FACTORY
-          ).join();
-
-          final var lookupTables = tableAccountInfos.stream()
-              .map(AccountInfo::data)
-              .collect(Collectors.toUnmodifiableMap(AddressLookupTable::address, Function.identity()));
-
-          instructions = skeleton.parseInstructions(skeleton.parseAccounts(lookupTables));
+          final var tableAccounts = skeleton.lookupTableAccounts();
+          if (tableAccounts.length == 0) {
+            instructions = skeleton.parseInstructionsWithoutTableAccounts();
+          } else {
+            final var tableAccountInfos = rpcClient.getMultipleAccounts(
+                Arrays.asList(tableAccounts),
+                AddressLookupTable.FACTORY
+            ).join();
+
+            final var lookupTables = tableAccountInfos.stream()
+                .map(AccountInfo::data)
+                .collect(Collectors.toUnmodifiableMap(AddressLookupTable::address, Function.identity()));
+
+            instructions = skeleton.parseInstructions(skeleton.parseAccounts(lookupTables));
+          }
         } else {
           throw new IllegalStateException("Unhandled tx version " + txVersion);
         }
@@ -101,6 +106,7 @@ public static void main(final String[] args) {
       final var usdcTokenMint = driftClient.spotMarket(DriftAsset.USDC).mint();
       final var usdcTokenContext = verifiedTokens.get(usdcTokenMint);
 
+      // Limit Long 0.1 @ 111 on SOL-PERP [reduceOnly=false] [postOnly=MustPostOnly]
       System.out.format("""
               %s %s %s @ %s on %s [reduceOnly=%b] [postOnly=%s]
               """,