Revert "Write final test testing BpfUpgradeableProgram"

This reverts commit 2ba22fd.

Revert "Rename authority to upgradeAuthority"

This reverts commit b585ce4.

Revert "Checkstyle"

This reverts commit 0e04aa2.

Revert "Didn't rename everything correctly to newUpgradeAuthority"

This reverts commit e824537.

src/integration-test/java/com/lmax/solana4j/programs/BpfLoaderUpgradableProgramIntegrationTest.java

@@ -0,0 +1,24 @@
+package com.lmax.solana4j.programs;
+
+import com.lmax.solana4j.parameterization.ParameterizedMessageEncodingTest;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class BpfLoaderUpgradableProgramIntegrationTest extends IntegrationTestBase
+{
+    @BeforeEach
+    void beforeEachTest()
+    {
+        solana.createKeyPair("payer");
+        solana.airdrop("payer", "0.01");
+    }
+
+    @Disabled
+    @ParameterizedMessageEncodingTest
+    void shouldSetUpgradeAuthority(final String messageEncoding)
+    {
+        fail();
+    }
+}

src/integration-test/resources/solana-run.sh

@@ -116,8 +116,6 @@ while true; do
 done
 set -e
 
-# bpf_program: CxmAHzszTVSWmtBnCXda7eUTemd8DGyax88yYk54A2PT (public key) 5A7mHgUWzqpb9sbyHMzn7dLvdfHGswk5PHxfUu2PTEKR (private key)
-# upgrade_authority: 13jT1jL8jpTFzFcZATPq9W4gmRB5uZbEYjXxJJbugB1d (public key) Ed4gbZARwspMoyVRPU3GvCCARFtRSPSw2TqtHvH6vvj8 (private key)
 solana program deploy /lmax_multisig.so --program-id /bpf_program.json --upgrade-authority /upgrade_authority.json
 #solana program show CxmAHzszTVSWmtBnCXda7eUTemd8DGyax88yYk54A2PT
 

src/main/java/com/lmax/solana4j/programs/BpfLoaderUpgradableProgram.java

@@ -0,0 +1,49 @@
+package com.lmax.solana4j.programs;
+
+import com.lmax.solana4j.Solana;
+import com.lmax.solana4j.api.PublicKey;
+import com.lmax.solana4j.api.TransactionBuilder;
+import org.bitcoinj.core.Base58;
+
+import java.nio.ByteOrder;
+import java.util.List;
+import java.util.Optional;
+
+final class BpfLoaderUpgradableProgram
+{
+    private static final byte[] PROGRAM_ID = Base58.decode("BPFLoaderUpgradeab1e11111111111111111111111");
+    public static final PublicKey PROGRAM_ACCOUNT = Solana.account(PROGRAM_ID);
+
+    private static final int SET_AUTHORITY_INSTRUCTION = 4;
+
+    private final TransactionBuilder tb;
+
+    public static BpfLoaderUpgradableProgram factory(final TransactionBuilder tb)
+    {
+        return new BpfLoaderUpgradableProgram(tb);
+    }
+
+    BpfLoaderUpgradableProgram(final TransactionBuilder tb)
+    {
+        this.tb = tb;
+    }
+
+    public BpfLoaderUpgradableProgram setUpgradeAuthority(
+            final PublicKey programAddress,
+            final PublicKey currentAuthorityAddress,
+            final Optional<PublicKey> maybeNewAuthorityAddress)
+    {
+        final PublicKey programDataAddress = Solana.programDerivedAddress(List.of(programAddress.bytes()), PROGRAM_ACCOUNT).address();
+
+        tb.append(ib ->
+        {
+            ib.program(PROGRAM_ACCOUNT)
+                    .account(programDataAddress, false, true)
+                    .account(currentAuthorityAddress, true, false);
+            maybeNewAuthorityAddress.ifPresent(newAuthorityAddress -> ib.account(newAuthorityAddress, false, false));
+            ib.data(4, bb -> bb.order(ByteOrder.LITTLE_ENDIAN).putInt(SET_AUTHORITY_INSTRUCTION));
+        });
+
+        return this;
+    }
+}

src/test-support/java/com/lmax/solana4j/SolanaDriver.java

@@ -366,28 +366,6 @@ public String setComputeUnits(final int computeUnitLimit, final long computeUnit
         return solanaApi.sendTransaction(transactionBlob);
     }
 
-    public String setUpgradeAuthority(
-            final PublicKey program,
-            final PublicKey oldUpgradeAuthority,
-            final PublicKey newUpgradeAuthority,
-            final PublicKey payer,
-            final List<TestKeyPair> signers,
-            final List<AddressLookupTable> addressLookupTables)
-    {
-        final Blockhash blockhash = solanaApi.getRecentBlockHash();
-
-        final String transactionBlob = getTransactionFactory().setUpgradeAuthority(
-                program,
-                oldUpgradeAuthority,
-                newUpgradeAuthority,
-                Solana.blockhash(blockhash.getBytes()),
-                payer,
-                signers,
-                addressLookupTables);
-
-        return solanaApi.sendTransaction(transactionBlob);
-    }
-
     public void setMessageEncoding(final String messageEncoding)
     {
         if (messageEncoding.equals("V0"))

src/test-support/java/com/lmax/solana4j/SolanaNodeDsl.java

@@ -17,17 +17,14 @@
 import com.lmax.solana4j.domain.TokenProgram;
 import com.lmax.solana4j.encoding.SolanaEncoding;
 import com.lmax.solana4j.programs.AddressLookupTableProgram;
-import com.lmax.solana4j.programs.BpfLoaderUpgradeableProgram;
 import com.lmax.solana4j.programs.SystemProgram;
 import com.lmax.solana4j.solanaclient.api.AccountInfo;
 import com.lmax.solana4j.solanaclient.api.TransactionData;
 import com.lmax.solana4j.solanaclient.jsonrpc.SolanaClient;
 import com.lmax.solana4j.util.TestKeyPairGenerator;
-import org.bitcoinj.core.Base58;
 import org.bouncycastle.util.encoders.Base64;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -79,10 +76,10 @@ public void airdrop(final String... args)
                 new RequiredArg("address"),
                 new RequiredArg("amountSol"));
 
-        final String address = testContext.lookupOrLiteral(params.value("address"), TestDataType.TEST_PUBLIC_KEY);
+        final TestPublicKey address = testContext.data(TestDataType.TEST_PUBLIC_KEY).lookup(params.value("address"));
         final Sol sol = new Sol(params.valueAsBigDecimal("amountSol"));
 
-        final String transactionSignature = solanaDriver.requestAirdrop(new TestPublicKey(Base58.decode(address)), sol.lamports());
+        final String transactionSignature = solanaDriver.requestAirdrop(address, sol.lamports());
 
         final long recentBlockHeight = solanaDriver.getBlockHeight();
         waitForBlockHeight(recentBlockHeight + 1);
@@ -603,62 +600,6 @@ public void setComputeUnits(final String... args)
         Waiter.waitFor(isNotNull(() -> solanaDriver.getTransactionResponse(transactionSignature).getTransaction()));
     }
 
-    public void setUpgradeAuthority(final String... args)
-    {
-        final DslParams params = DslParams.create(
-                args,
-                new RequiredArg("program"),
-                new RequiredArg("oldUpgradeAuthorityPublicKey"),
-                new RequiredArg("oldUpgradeAuthorityPrivateKey"),
-                new RequiredArg("newUpgradeAuthority"),
-                new RequiredArg("payer"),
-                new OptionalArg("addressLookupTables")
-        );
-
-        final String program = testContext.lookupOrLiteral(params.value("program"), TestDataType.TEST_PUBLIC_KEY);
-        final String oldUpgradeAuthorityPublicKey = testContext.lookupOrLiteral(params.value("oldUpgradeAuthorityPublicKey"), TestDataType.TEST_PUBLIC_KEY);
-        final String oldUpgradeAuthorityPrivateKey = testContext.lookupOrLiteral(params.value("oldUpgradeAuthorityPrivateKey"), TestDataType.TEST_KEY_PAIR);
-
-        final String newAuthority = testContext.lookupOrLiteral(params.value("newUpgradeAuthority"), TestDataType.TEST_PUBLIC_KEY);
-
-        final TestKeyPair payer = testContext.data(TestDataType.TEST_KEY_PAIR).lookup(params.value("payer"));
-
-        final List<AddressLookupTable> addressLookupTables = params.valuesAsList("addressLookupTables").stream()
-                .map(testContext.data(TestDataType.ADDRESS_LOOKUP_TABLE)::lookup)
-                .filter(Objects::nonNull)
-                .toList();
-
-        final String transactionSignature = solanaDriver.setUpgradeAuthority(
-                Solana.account(Base58.decode(program)),
-                Solana.account(Base58.decode(oldUpgradeAuthorityPublicKey)),
-                Solana.account(Base58.decode(newAuthority)),
-                payer.getSolana4jPublicKey(),
-                List.of(payer, new TestKeyPair(oldUpgradeAuthorityPublicKey, oldUpgradeAuthorityPrivateKey)),
-                addressLookupTables);
-
-        Waiter.waitFor(isNotNull(() -> solanaDriver.getTransactionResponse(transactionSignature).getTransaction()));
-    }
-
-    public void upgradeAuthority(final String... args)
-    {
-        final DslParams params = DslParams.create(
-                args,
-                new RequiredArg("address"),
-                new OptionalArg("upgradeAuthority")
-        );
-
-        final String address = testContext.lookupOrLiteral(params.value("address"), TestDataType.TEST_PUBLIC_KEY);
-        final String upgradeAuthority = testContext.lookupOrLiteral(params.value("upgradeAuthority"), TestDataType.TEST_PUBLIC_KEY);
-
-        final ProgramDerivedAddress programDataAddress = BpfLoaderUpgradeableProgram.deriveAddress(Solana.account(Base58.decode(address)));
-
-        final AccountInfo accountInfo = Waiter.waitFor(isNotNull(() -> solanaDriver.getAccountInfo(new TestPublicKey(programDataAddress.address().bytes()))));
-
-        final byte[] accountInfoBytes = Base64.decode(accountInfo.getData().get(0));
-
-        assertThat(Base58.encode(Arrays.copyOfRange(accountInfoBytes, 13, 45))).isEqualTo(upgradeAuthority);
-    }
-
     private void waitForSlot(final long slot)
     {
         Waiter.waitFor(isTrue(() -> solanaDriver.getSlot() > slot));

src/test-support/java/com/lmax/solana4j/TestContext.java

@@ -12,21 +12,4 @@ public final <T> TestDataStore<T> data(final TestDataType<T> key)
     {
         return (TestDataStore<T>) data.computeIfAbsent(key, unused -> new TestDataStore<>());
     }
-
-    @SuppressWarnings("unchecked")
-    public <T> String lookupOrLiteral(final String alias, final TestDataType<T> testDataType)
-    {
-        if (alias.startsWith("<") && alias.endsWith(">"))
-        {
-            return alias.substring(1, alias.length() - 1);
-        }
-        else
-        {
-            final TestDataStore<?> testDataStore = data.get(testDataType);
-
-            final T lookup = (T) testDataStore.lookup(alias);
-
-            return testDataType.getTransform().apply(lookup);
-        }
-    }
 }