Actually use lookup accounts in integration tests and hence uncover a…

… bug - the countUnsignedReadOnly accounts only refers to static accounts, not the lookup accounts. This was an incorrect assumption made during refactoring.
LMAX-Exchange · Sep 27, 2024 · f336445 · f336445
1 parent 4f98e25
commit f336445
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 32 deletions.
diff --git a/...ration-test/java/com/lmax/solana4j/programs/AddressLookupTableProgramIntegrationTest.java b/...ration-test/java/com/lmax/solana4j/programs/AddressLookupTableProgramIntegrationTest.java
@@ -19,7 +19,7 @@ void shouldCreateAddressLookupTable(final String messageEncoding)
         solana.setMessageEncoding(messageEncoding);
 
         solana.createAddressLookupTable("lookupTableAddress", "addressLookupTableAuthority", "payer");
-        solana.retrieveAddressLookupTable("lookupTableAddress");
+        solana.verifyAddressLookupTable("lookupTableAddress");
     }
 
     @ParameterizedMessageEncodingTest
@@ -40,7 +40,7 @@ void shouldExtendAddressLookupTable(final String messageEncoding)
                 "addressForLookupTable1, addressForLookupTable2, addressForLookupTable3"
         );
 
-        solana.retrieveAddressLookupTable(
+        solana.verifyAddressLookupTable(
                 "lookupTableAddress",
                 "addressForLookupTable1, addressForLookupTable2, addressForLookupTable3"
         );

diff --git a/src/main/java/com/lmax/solana4j/encoding/AccountLookups.java b/src/main/java/com/lmax/solana4j/encoding/AccountLookups.java
@@ -80,9 +80,4 @@ public Set<PublicKey> getAccountsInLookupTables()
     {
         return accountsInLookupTables;
     }
-
-    public int countUnsignedReadOnly()
-    {
-        return accountLookupEntries.stream().map(x -> x.getReadOnlyLookupEntrys().size()).mapToInt(Integer::intValue).sum();
-    }
 }
diff --git a/src/main/java/com/lmax/solana4j/encoding/SolanaAccounts.java b/src/main/java/com/lmax/solana4j/encoding/SolanaAccounts.java
@@ -110,8 +110,6 @@ else if (!accountReference.isWriter())
             }
         }
 
-        countUnsignedReadOnly += accountLookups.countUnsignedReadOnly();
-
         return new SolanaAccounts(
                 staticAccountReferences.stream().map(TransactionInstruction.AccountReference::account).collect(Collectors.toList()),
                 accountLookups.getAccountLookupEntrys(),

diff --git a/src/main/java/com/lmax/solana4j/encoding/SolanaV0MessageView.java b/src/main/java/com/lmax/solana4j/encoding/SolanaV0MessageView.java
@@ -85,16 +85,9 @@ public List<MessageVisitor.V0InstructionView> instructions()
 
     private boolean isWriterStaticAccount(final int index)
     {
-        final var unsignedReadOnlyLookupAccountsCount = accountLookups
-                .stream()
-                .map(x -> x.readOnlyTableIndexes().size())
-                .mapToInt(Integer::intValue)
-                .sum();
-
-        final var unsignedReadOnlyStaticAccountsCount = countAccountsUnsignedReadOnly() - unsignedReadOnlyLookupAccountsCount;
         final var signedWriterStaticAccountsCount = countAccountsSigned() - countAccountsSignedReadOnly();
         final var isSignerWriter = index < signedWriterStaticAccountsCount;
-        final var isNonSignerWriter = (index > (countAccountsSigned() - 1) && (index < (accountsView.staticAccounts().size() - unsignedReadOnlyStaticAccountsCount)));
+        final var isNonSignerWriter = (index >= countAccountsSigned() && (index < (accountsView.staticAccounts().size() - countAccountsUnsignedReadOnly())));
 
         return isSignerWriter || isNonSignerWriter;
     }

diff --git a/src/test-support/java/com/lmax/solana4j/SolanaNodeDsl.java b/src/test-support/java/com/lmax/solana4j/SolanaNodeDsl.java
@@ -87,25 +87,23 @@ public void airdropSol(final String... args)
         Waiter.waitFor(transactionFinalized(transactionSignature));
     }
 
-    public void retrieveAddressLookupTable(final String... args)
+    public void verifyAddressLookupTable(final String... args)
     {
         final DslParams params = DslParams.create(
                 args,
                 new RequiredArg("lookupTableAddress"),
                 new OptionalArg("addresses").setAllowMultipleValues()
         );
 
-        final TestPublicKey account = testContext.data(TestDataType.TEST_PUBLIC_KEY).lookup(params.value("lookupTableAddress"));
-
-        final AccountInfo accountInfo = Waiter.waitFor(isNotNull(() -> solanaDriver.getAccountInfo(account)));
+        final TestPublicKey lookupTableAddress = testContext.data(TestDataType.TEST_PUBLIC_KEY).lookup(params.value("lookupTableAddress"));
 
         final List<PublicKey> expectedAddresses = stream(params.values("addresses"))
                 .map(address -> testContext.data(TestDataType.TEST_KEY_PAIR).lookup(address).getSolana4jPublicKey())
                 .collect(Collectors.toList());
 
-        final AddressLookupTable addressLookupTable = AddressLookupTableProgram.deserializeAddressLookupTable(account.getSolana4jPublicKey(), Base64.decode(accountInfo.getData().get(0)));
+        final AddressLookupTable addressLookupTable = storeAddressLookupTable(lookupTableAddress, params.value("lookupTableAddress"));
+
         assertThat(addressLookupTable.getAddresses()).usingRecursiveComparison().isEqualTo(expectedAddresses);
-        testContext.data(TestDataType.ADDRESS_LOOKUP_TABLE).store(params.value("lookupTableAddress"), addressLookupTable);
     }
 
     public void createAddressLookupTable(final String... args)
@@ -122,13 +120,15 @@ public void createAddressLookupTable(final String... args)
         final long recentSlot = solanaDriver.getSlot();
 
         final ProgramDerivedAddress programDerivedAddress = AddressLookupTableProgram.deriveAddress(authority.getSolana4jPublicKey(), SolanaEncoding.slot(recentSlot));
-        final TestPublicKey address = new TestPublicKey(programDerivedAddress.address().bytes());
-        testContext.data(TestDataType.TEST_PUBLIC_KEY).store(params.value("lookupTableAddress"), address);
+        final TestPublicKey lookupTableAddress = new TestPublicKey(programDerivedAddress.address().bytes());
+        testContext.data(TestDataType.TEST_PUBLIC_KEY).store(params.value("lookupTableAddress"), lookupTableAddress);
 
         // intermittency caused by slot not moving on to the next slot before including in the sent transaction
         waitForSlot(recentSlot + 1);
         final String transactionSignature = solanaDriver.createAddressLookupTable(programDerivedAddress, authority, payer, SolanaEncoding.slot(recentSlot));
         Waiter.waitFor(transactionFinalized(transactionSignature));
+
+        storeAddressLookupTable(lookupTableAddress, params.value("lookupTableAddress"));
     }
 
     public void extendAddressLookupTable(final String... args)
@@ -142,7 +142,7 @@ public void extendAddressLookupTable(final String... args)
                 new OptionalArg("addressLookupTables").setAllowMultipleValues()
         );
 
-        final TestPublicKey addressLookupTable = testContext.data(TestDataType.TEST_PUBLIC_KEY).lookup(params.value("lookupTableAddress"));
+        final TestPublicKey lookupTableAddress = testContext.data(TestDataType.TEST_PUBLIC_KEY).lookup(params.value("lookupTableAddress"));
         final TestKeyPair authority = testContext.data(TestDataType.TEST_KEY_PAIR).lookup(params.value("authority"));
         final TestKeyPair payer = testContext.data(TestDataType.TEST_KEY_PAIR).lookup(params.value("payer"));
         final List<AddressLookupTable> addressLookupTables = params.valuesAsList("addressLookupTables").stream()
@@ -156,9 +156,11 @@ public void extendAddressLookupTable(final String... args)
             addresses.add(testContext.data(TestDataType.TEST_PUBLIC_KEY).lookup(address));
         }
 
-        final String transactionSignature = solanaDriver.extendAddressLookupTable(addressLookupTable, authority, payer, addresses, addressLookupTables);
+        final String transactionSignature = solanaDriver.extendAddressLookupTable(lookupTableAddress, authority, payer, addresses, addressLookupTables);
 
         Waiter.waitFor(transactionFinalized(transactionSignature));
+
+        storeAddressLookupTable(lookupTableAddress, params.value("lookupTableAddress"));
     }
 
     public void waitForSlot(final String... args)
@@ -795,4 +797,14 @@ private Condition<TransactionData> transactionFinalized(final String transaction
     {
         return isNotNull(() -> solanaDriver.getTransactionResponse(transactionSignature).getTransaction());
     }
+
+    private AddressLookupTable storeAddressLookupTable(final TestPublicKey lookupTableAddress, final String lookupTableAlias)
+    {
+        final AccountInfo accountInfo = Waiter.waitFor(isNotNull(() -> solanaDriver.getAccountInfo(lookupTableAddress)));
+        final AddressLookupTable addressLookupTable = AddressLookupTableProgram.deserializeAddressLookupTable(
+                lookupTableAddress.getSolana4jPublicKey(),
+                Base64.decode(accountInfo.getData().get(0)));
+        testContext.data(TestDataType.ADDRESS_LOOKUP_TABLE).store(lookupTableAlias, addressLookupTable);
+        return addressLookupTable;
+    }
 }
diff --git a/src/test/java/com/lmax/solana4j/SolanaV0MessageBuilderConformanceTest.java b/src/test/java/com/lmax/solana4j/SolanaV0MessageBuilderConformanceTest.java
@@ -308,7 +308,7 @@ void checkSimpleUnsignedMessageHeader()
                 .expect("version header", (byte) 128)
                 .expect("count signed accounts", (byte) 3)
                 .expect("count signed read-only accounts", (byte) 1)
-                .expect("count unsigned read-only accounts", (byte) 2);
+                .expect("count unsigned read-only accounts", (byte) 1);
     }
 
     @Test
@@ -322,7 +322,7 @@ void checkComplexUnsignedMessageHeader()
                 .expect("version header", (byte) 128)
                 .expect("count signed accounts", (byte) 6)
                 .expect("count signed read-only accounts", (byte) 2)
-                .expect("count unsigned read-only accounts", (byte) 4);
+                .expect("count unsigned read-only accounts", (byte) 3);
     }
 
     @Test

diff --git a/src/test/java/com/lmax/solana4j/encoding/SolanaAccountsTest.java b/src/test/java/com/lmax/solana4j/encoding/SolanaAccountsTest.java
@@ -545,7 +545,7 @@ void nonSignerInLookupTableNoLongerInStaticAccounts()
     }
 
     @Test
-    void unsignedReadOnlyAccountReferenceInLookupTable()
+    void unsignedReadOnlyAccountReferenceInLookupTableNotIncludedInUnsignedReadOnlyCountOfMessage()
     {
         final SolanaAccount roUAccount = new SolanaAccount(ACCOUNT1);
 
@@ -568,7 +568,7 @@ void unsignedReadOnlyAccountReferenceInLookupTable()
         lookupAccountsEqual(accounts.getAccountLookups(), lookupTableAddress, List.of(roUAccount));
         accountLookupReadOnlyIndexEquals(accounts.getAccountLookups(), lookupTableAddress, roUAccount, 0);
         flattenedAccountListEquals(accounts.getFlattenedAccountList(), List.of(RW_S_PAYER_ACCOUNT, RO_U_PROGRAM1_ACCOUNT, roUAccount));
-        countUnsignedReadOnlyEquals(accounts.getCountUnsignedReadOnly(), 2);
+        countUnsignedReadOnlyEquals(accounts.getCountUnsignedReadOnly(), 1);
         countSignedReadOnlyEquals(accounts.getCountSignedReadOnly(), 0);
         countSignedEquals(accounts.getCountSigned(), 1);
     }

diff --git a/src/test/java/com/lmax/solana4j/encoding/SolanaV0MessageViewTest.java b/src/test/java/com/lmax/solana4j/encoding/SolanaV0MessageViewTest.java
@@ -77,7 +77,7 @@ void correctlyReportCounts()
 
         assertThat(messageView.countAccountsSigned()).isEqualTo(3);
         assertThat(messageView.countAccountsSignedReadOnly()).isEqualTo(1);
-        assertThat(messageView.countAccountsUnsignedReadOnly()).isEqualTo(2);
+        assertThat(messageView.countAccountsUnsignedReadOnly()).isEqualTo(1);
     }
 
     @Test