Merge pull request #709 from lightsail-network/add-protocol23-support

Add protocol23 support

Author: overcat

CHANGELOG.md

@@ -5,6 +5,25 @@
 ### Update:
 - feat: add `pollTransaction` method to `SorobanServer` to poll transaction status with retry strategy. ([#696](https://github.com/stellar/java-stellar-sdk/pull/696))
 - feat: implement message signing and verification according to [SEP-53](https://github.com/stellar/stellar-protocol/blob/master/ecosystem/sep-0053.md), check `KeyPair.signMessage` and `KeyPair.verifyMessage` for more details. ([#698](https://github.com/stellar/java-stellar-sdk/pull/698))
+- feat: add `isValidEd25519SecretSeed`, `isValidPreAuthTx` and `isValidSha256Hash` to `StrKey` class, these functions can be used to validate the corresponding strkey.
+- feat: add med25519 public key support to `StrKey`.
+- feat: add muxed account, liquidity pool and claimable balance support to `Address` class.
+- feat: add `destinationMuxedId` and `destinationMuxedIdType` to `InvokeHostFunctionOperationResponse.AssetContractBalanceChange`.
+- feat: add `events` field to `GetTransactionsResponse.Transaction` and `GetTransactionResponse`, see [stellar-rpc#455](https://github.com/stellar/stellar-rpc/pull/455) for more details.
+- feat: add `oldestLedger`, `latestLedgerCloseTime` and `oldestLedgerCloseTime` fields to `GetEventsResponse`, and add `transactionIndex` and `operationIndex` fields to `GetEventsResponse.EventInfo`, check [Stellar RPC release log](https://github.com/stellar/stellar-rpc/releases/tag/v23.0.0-rc.1) for more information. 
+- feat: add support for non-root authorization in `SorobanServer#simulateTransaction`.
+
+### Breaking changes:
+- refactor!: the following functions in `StrKey` are marked as deprecated, they will be removed in the next major release; please refer to the documentation for each function to see the corresponding replacement functions:
+  - `StrKey#encodeEd25519PublicKey(AccountID)`
+  - `StrKey#encodeMuxedAccount(MuxedAccount)`
+  - `StrKey#decodeMuxedAccount(String)`
+  - `StrKey#encodeToXDRAccountId(String)`
+  - `StrKey#encodeToXDRMuxedAccount(String)`
+- refactor!: remove `numArchivedContracts` and `archivedContractsAmount` from `AssetResponse`.
+- refactor!: `GetTransactionsResponse.Transaction#getDiagnosticEventsXdr()` and `GetTransactionsResponse.Transaction#parseDiagnosticEventsXdr()` has been marked as deprecated, they will be removed in Stellar RPC soon, use `GetTransactionsResponse.Transaction#getEvents()` instead.
+- refactor!: remove deprecated `pagingToken` field from `GetEventsResponse.EventInfo`.
+- refactor!: `inSuccessfulContractCall` in `GetEventsResponse.EventInfo` has been marked as deprecated, it will be removed in the next release.
 
 ## 1.5.0
 

Makefile

@@ -10,12 +10,13 @@ xdr/Stellar-contract-meta.x \
 xdr/Stellar-contract-spec.x \
 xdr/Stellar-contract.x \
 xdr/Stellar-internal.x \
-xdr/Stellar-contract-config-setting.x
+xdr/Stellar-contract-config-setting.x \
+xdr/Stellar-exporter.x
 
 # xdrgen commit to use, see https://github.com/stellar/xdrgen
-XDRGEN_COMMIT=6d4d47b4bc6815e26a52d62fd6613cfb56676d4b
+XDRGEN_COMMIT=6b98787dcbb2b6407880adec5f74c6d88975ab0f
 # stellar-xdr commit to use, see https://github.com/stellar/stellar-xdr
-XDR_COMMIT=529d5176f24c73eeccfa5eba481d4e89c19b1181
+XDR_COMMIT=4b7a2ef7931ab2ca2499be68d849f38190b443ca
 
 .PHONY: xdr xdr-clean xdr-update
 

android_test/app/src/main/java/org/stellar/javastellarsdkdemoapp/MainActivity.kt

@@ -48,7 +48,6 @@ import org.stellar.sdk.xdr.ContractIDPreimage
 import org.stellar.sdk.xdr.ContractIDPreimage.ContractIDPreimageFromAddress
 import org.stellar.sdk.xdr.ContractIDPreimageType
 import org.stellar.sdk.xdr.CreateContractArgs
-import org.stellar.sdk.xdr.ExtensionPoint
 import org.stellar.sdk.xdr.HostFunction
 import org.stellar.sdk.xdr.HostFunctionType
 import org.stellar.sdk.xdr.Int64
@@ -187,13 +186,13 @@ private fun testSDK(): String {
                             .readWrite(arrayOf())
                             .build()
                     )
-                    .readBytes(Uint32(XdrUnsignedInteger(699)))
+                    .diskReadBytes(Uint32(XdrUnsignedInteger(699)))
                     .writeBytes(Uint32(XdrUnsignedInteger(0)))
                     .instructions(Uint32(XdrUnsignedInteger(34567)))
                     .build()
             )
             .resourceFee(Int64(100L))
-            .ext(ExtensionPoint.builder().discriminant(0).build())
+            .ext(SorobanTransactionData.SorobanTransactionDataExt.builder().discriminant(0).build())
             .build()
         val sorobanDataString = sorobanData.toXdrBase64()
 

src/main/java/org/stellar/sdk/Address.java

@@ -1,14 +1,22 @@
 package org.stellar.sdk;
 
+import java.io.IOException;
+import java.util.Arrays;
 import lombok.EqualsAndHashCode;
+import org.stellar.sdk.exception.UnexpectedException;
+import org.stellar.sdk.xdr.ClaimableBalanceID;
+import org.stellar.sdk.xdr.ClaimableBalanceIDType;
+import org.stellar.sdk.xdr.ContractID;
 import org.stellar.sdk.xdr.Hash;
+import org.stellar.sdk.xdr.MuxedEd25519Account;
+import org.stellar.sdk.xdr.PoolID;
 import org.stellar.sdk.xdr.SCAddress;
 import org.stellar.sdk.xdr.SCVal;
 import org.stellar.sdk.xdr.SCValType;
 
 /**
- * Represents a single address in the Stellar network. An address can represent an account or a
- * contract.
+ * Represents a single address in the Stellar network. An address can represent an account,
+ * contract, muxed account, claimable balance, or liquidity pool.
  */
 @EqualsAndHashCode
 public class Address {
@@ -18,9 +26,10 @@ public class Address {
   private final AddressType type;
 
   /**
-   * Creates a new {@link Address} from a Stellar public key or contract ID.
+   * Creates a new {@link Address} from a Stellar public key (G...), contract ID (C...), med25519
+   * public key (M...), liquidity pool ID (L...), or claimable balance ID (B...).
    *
-   * @param address the StrKey encoded format of Stellar public key or contract ID.
+   * @param address the StrKey encoded format of Stellar address.
    */
   public Address(String address) {
     if (StrKey.isValidEd25519PublicKey(address)) {
@@ -29,6 +38,15 @@ public Address(String address) {
     } else if (StrKey.isValidContract(address)) {
       this.type = AddressType.CONTRACT;
       this.key = StrKey.decodeContract(address);
+    } else if (StrKey.isValidMed25519PublicKey(address)) {
+      this.type = AddressType.MUXED_ACCOUNT;
+      this.key = StrKey.decodeMed25519PublicKey(address);
+    } else if (StrKey.isValidClaimableBalance(address)) {
+      this.type = AddressType.CLAIMABLE_BALANCE;
+      this.key = StrKey.decodeClaimableBalance(address);
+    } else if (StrKey.isValidLiquidityPool(address)) {
+      this.type = AddressType.LIQUIDITY_POOL;
+      this.key = StrKey.decodeLiquidityPool(address);
     } else {
       throw new IllegalArgumentException("Unsupported address type");
     }
@@ -37,7 +55,7 @@ public Address(String address) {
   /**
    * Creates a new {@link Address} from a Stellar public key.
    *
-   * @param accountId the byte array of the Stellar public key.
+   * @param accountId the byte array of the Stellar public key (G...).
    * @return a new {@link Address} object from the given Stellar public key.
    */
   public static Address fromAccount(byte[] accountId) {
@@ -54,6 +72,36 @@ public static Address fromContract(byte[] contractId) {
     return new Address(StrKey.encodeContract(contractId));
   }
 
+  /**
+   * Creates a new {@link Address} from a Stellar med25519 public key.
+   *
+   * @param muxedAccountId the byte array of the Stellar med25519 public key (M...).
+   * @return a new {@link Address} object from the given Stellar med25519 public key.
+   */
+  public static Address fromMuxedAccount(byte[] muxedAccountId) {
+    return new Address(StrKey.encodeMed25519PublicKey(muxedAccountId));
+  }
+
+  /**
+   * Creates a new {@link Address} from a Stellar Claimable Balance ID.
+   *
+   * @param claimableBalanceId the byte array of the Stellar Claimable Balance ID (B...).
+   * @return a new {@link Address} object from the given Stellar Claimable Balance ID.
+   */
+  public static Address fromClaimableBalance(byte[] claimableBalanceId) {
+    return new Address(StrKey.encodeClaimableBalance(claimableBalanceId));
+  }
+
+  /**
+   * Creates a new {@link Address} from a Stellar Liquidity Pool ID.
+   *
+   * @param liquidityPoolId the byte array of the Stellar Liquidity Pool ID (L...).
+   * @return a new {@link Address} object from the given Stellar Liquidity Pool ID.
+   */
+  public static Address fromLiquidityPool(byte[] liquidityPoolId) {
+    return new Address(StrKey.encodeLiquidityPool(liquidityPoolId));
+  }
+
   /**
    * Creates a new {@link Address} from a {@link SCAddress} XDR object.
    *
@@ -63,9 +111,28 @@ public static Address fromContract(byte[] contractId) {
   public static Address fromSCAddress(SCAddress scAddress) {
     switch (scAddress.getDiscriminant()) {
       case SC_ADDRESS_TYPE_ACCOUNT:
-        return new Address(StrKey.encodeEd25519PublicKey(scAddress.getAccountId()));
+        return fromAccount(scAddress.getAccountId().getAccountID().getEd25519().getUint256());
       case SC_ADDRESS_TYPE_CONTRACT:
-        return new Address(StrKey.encodeContract(scAddress.getContractId().getHash()));
+        return fromContract(scAddress.getContractId().getContractID().getHash());
+      case SC_ADDRESS_TYPE_MUXED_ACCOUNT:
+        try {
+          return fromMuxedAccount(scAddress.getMuxedAccount().toXdrByteArray());
+        } catch (IOException e) {
+          throw new UnexpectedException(e);
+        }
+      case SC_ADDRESS_TYPE_CLAIMABLE_BALANCE:
+        if (scAddress.getClaimableBalanceId().getDiscriminant()
+            != ClaimableBalanceIDType.CLAIMABLE_BALANCE_ID_TYPE_V0) {
+          throw new IllegalArgumentException(
+              "The claimable balance ID type is not supported, it must be `CLAIMABLE_BALANCE_ID_TYPE_V0`.");
+        }
+        byte[] v0Bytes = scAddress.getClaimableBalanceId().getV0().getHash();
+        byte[] withZeroPrefix = new byte[v0Bytes.length + 1];
+        withZeroPrefix[0] = 0x00;
+        System.arraycopy(v0Bytes, 0, withZeroPrefix, 1, v0Bytes.length);
+        return fromClaimableBalance(withZeroPrefix);
+      case SC_ADDRESS_TYPE_LIQUIDITY_POOL:
+        return fromLiquidityPool(scAddress.getLiquidityPoolId().getPoolID().getHash());
       default:
         throw new IllegalArgumentException("Unsupported address type");
     }
@@ -100,7 +167,39 @@ public SCAddress toSCAddress() {
         break;
       case CONTRACT:
         scAddress.setDiscriminant(org.stellar.sdk.xdr.SCAddressType.SC_ADDRESS_TYPE_CONTRACT);
-        scAddress.setContractId(new Hash(this.key));
+        scAddress.setContractId(new ContractID(new Hash(this.key)));
+        break;
+      case MUXED_ACCOUNT:
+        scAddress.setDiscriminant(org.stellar.sdk.xdr.SCAddressType.SC_ADDRESS_TYPE_MUXED_ACCOUNT);
+        try {
+          scAddress.setMuxedAccount(MuxedEd25519Account.fromXdrByteArray(this.key));
+        } catch (IOException e) {
+          throw new IllegalArgumentException("Invalid med25519 public key", e);
+        }
+        break;
+      case CLAIMABLE_BALANCE:
+        if (this.key[0] != 0x00) {
+          throw new IllegalArgumentException(
+              "The claimable balance ID type is not supported, it must be `CLAIMABLE_BALANCE_ID_TYPE_V0`.");
+        }
+        byte[] hashBytes = Arrays.copyOfRange(this.key, 1, this.key.length);
+        Hash hash = new Hash(hashBytes);
+        ClaimableBalanceID claimableBalanceID =
+            ClaimableBalanceID.builder()
+                .discriminant(ClaimableBalanceIDType.CLAIMABLE_BALANCE_ID_TYPE_V0)
+                .v0(hash)
+                .build();
+        scAddress.setDiscriminant(
+            org.stellar.sdk.xdr.SCAddressType.SC_ADDRESS_TYPE_CLAIMABLE_BALANCE);
+        scAddress.setClaimableBalanceId(claimableBalanceID);
+        break;
+      case LIQUIDITY_POOL:
+        scAddress.setDiscriminant(org.stellar.sdk.xdr.SCAddressType.SC_ADDRESS_TYPE_LIQUIDITY_POOL);
+        try {
+          scAddress.setLiquidityPoolId(PoolID.fromXdrByteArray(this.key));
+        } catch (IOException e) {
+          throw new IllegalArgumentException("Invalid liquidity pool ID", e);
+        }
         break;
       default:
         throw new IllegalArgumentException("Unsupported address type");
@@ -145,6 +244,12 @@ public String toString() {
         return StrKey.encodeEd25519PublicKey(this.key);
       case CONTRACT:
         return StrKey.encodeContract(this.key);
+      case MUXED_ACCOUNT:
+        return StrKey.encodeMed25519PublicKey(this.key);
+      case CLAIMABLE_BALANCE:
+        return StrKey.encodeClaimableBalance(this.key);
+      case LIQUIDITY_POOL:
+        return StrKey.encodeLiquidityPool(this.key);
       default:
         throw new IllegalArgumentException("Unsupported address type");
     }
@@ -153,6 +258,9 @@ public String toString() {
   /** Represents the type of the address. */
   public enum AddressType {
     ACCOUNT,
-    CONTRACT
+    CONTRACT,
+    MUXED_ACCOUNT,
+    CLAIMABLE_BALANCE,
+    LIQUIDITY_POOL
   }
 }

src/main/java/org/stellar/sdk/Asset.java

@@ -71,12 +71,16 @@ public static Asset fromXdr(org.stellar.sdk.xdr.Asset xdr) {
       case ASSET_TYPE_CREDIT_ALPHANUM4:
         String assetCode4 =
             Util.paddedByteArrayToString(xdr.getAlphaNum4().getAssetCode().getAssetCode4());
-        accountId = StrKey.encodeEd25519PublicKey(xdr.getAlphaNum4().getIssuer());
+        accountId =
+            StrKey.encodeEd25519PublicKey(
+                xdr.getAlphaNum4().getIssuer().getAccountID().getEd25519().getUint256());
         return new AssetTypeCreditAlphaNum4(assetCode4, accountId);
       case ASSET_TYPE_CREDIT_ALPHANUM12:
         String assetCode12 =
             Util.paddedByteArrayToString(xdr.getAlphaNum12().getAssetCode().getAssetCode12());
-        accountId = StrKey.encodeEd25519PublicKey(xdr.getAlphaNum12().getIssuer());
+        accountId =
+            StrKey.encodeEd25519PublicKey(
+                xdr.getAlphaNum12().getIssuer().getAccountID().getEd25519().getUint256());
         return new AssetTypeCreditAlphaNum12(assetCode12, accountId);
       default:
         throw new IllegalArgumentException("Unknown asset type " + xdr.getDiscriminant());

src/main/java/org/stellar/sdk/AssetTypeCreditAlphaNum12.java

@@ -33,7 +33,9 @@ public AssetType getType() {
 
   public static AssetTypeCreditAlphaNum12 fromXdr(org.stellar.sdk.xdr.AlphaNum12 alphaNum12) {
     String assetCode12 = Util.paddedByteArrayToString(alphaNum12.getAssetCode().getAssetCode12());
-    String accountId = StrKey.encodeEd25519PublicKey(alphaNum12.getIssuer());
+    String accountId =
+        StrKey.encodeEd25519PublicKey(
+            alphaNum12.getIssuer().getAccountID().getEd25519().getUint256());
     return new AssetTypeCreditAlphaNum12(assetCode12, accountId);
   }
 
@@ -45,7 +47,7 @@ public org.stellar.sdk.xdr.Asset toXdr() {
     AssetCode12 assetCode12 = new AssetCode12();
     assetCode12.setAssetCode12(Util.paddedByteArray(code, 12));
     credit.setAssetCode(assetCode12);
-    credit.setIssuer(StrKey.encodeToXDRAccountId(issuer));
+    credit.setIssuer(KeyPair.fromAccountId(issuer).getXdrAccountId());
     xdr.setAlphaNum12(credit);
     return xdr;
   }

src/main/java/org/stellar/sdk/AssetTypeCreditAlphaNum4.java

@@ -33,7 +33,9 @@ public AssetType getType() {
 
   public static AssetTypeCreditAlphaNum4 fromXdr(org.stellar.sdk.xdr.AlphaNum4 alphaNum4) {
     String assetCode4 = Util.paddedByteArrayToString(alphaNum4.getAssetCode().getAssetCode4());
-    String accountId = StrKey.encodeEd25519PublicKey(alphaNum4.getIssuer());
+    String accountId =
+        StrKey.encodeEd25519PublicKey(
+            alphaNum4.getIssuer().getAccountID().getEd25519().getUint256());
     return new AssetTypeCreditAlphaNum4(assetCode4, accountId);
   }
 
@@ -45,7 +47,7 @@ public org.stellar.sdk.xdr.Asset toXdr() {
     AssetCode4 assetCode4 = new AssetCode4();
     assetCode4.setAssetCode4(Util.paddedByteArray(code, 4));
     credit.setAssetCode(assetCode4);
-    credit.setIssuer(StrKey.encodeToXDRAccountId(issuer));
+    credit.setIssuer(KeyPair.fromAccountId(issuer).getXdrAccountId());
     xdr.setAlphaNum4(credit);
     return xdr;
   }

src/main/java/org/stellar/sdk/FeeBumpTransaction.java

@@ -120,7 +120,7 @@ public static FeeBumpTransaction fromFeeBumpTransactionEnvelope(
       FeeBumpTransactionEnvelope envelope, Network network) {
     Transaction inner =
         Transaction.fromV1EnvelopeXdr(envelope.getTx().getInnerTx().getV1(), network);
-    String feeSource = StrKey.encodeMuxedAccount(envelope.getTx().getFeeSource());
+    String feeSource = MuxedAccount.fromXdr(envelope.getTx().getFeeSource()).getAddress();
     long fee = envelope.getTx().getFee().getInt64();
     FeeBumpTransaction feeBump = new FeeBumpTransaction(feeSource, fee, inner);
     feeBump.signatures.addAll(Arrays.asList(envelope.getSignatures()));
@@ -135,7 +135,7 @@ private org.stellar.sdk.xdr.FeeBumpTransaction toXdr() {
     Int64 xdrFee = new Int64();
     xdrFee.setInt64(fee);
     xdr.setFee(xdrFee);
-    xdr.setFeeSource(StrKey.decodeMuxedAccount(this.feeSource));
+    xdr.setFeeSource(new MuxedAccount(this.feeSource).toXdr());
     org.stellar.sdk.xdr.FeeBumpTransaction.FeeBumpTransactionInnerTx innerXDR =
         new org.stellar.sdk.xdr.FeeBumpTransaction.FeeBumpTransactionInnerTx();
     innerXDR.setDiscriminant(EnvelopeType.ENVELOPE_TYPE_TX);