Merge remote-tracking branch 'origin/master' into HEAD

Author: ifropc

.circleci/config.yml

@@ -19,14 +19,18 @@ jobs:
             - libs/stellar-sdk.jar
   deploy:
     docker:
-      - image: cibuilds/github:0.10
+      - image: cimg/go:1.17
     steps:
       - attach_workspace:
           at: ./build
       - run:
-          name: "Publish Release on GitHub"
+          name: "Install github.com/github-release/github-release v0.10.0"
           command: |
-            ghr -replace -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} ${CIRCLE_TAG} ./build/libs
+            go get github.com/github-release/github-release@v0.10.0
+      - run:
+          name: "Upload JAR to GitHub Release"
+          command: |
+            github-release upload -s ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -t ${CIRCLE_TAG} -f ./build/libs/stellar-sdk.jar -n java-stellar-sdk.jar
 
   after_deploy:
     docker:

.github/workflows/update-completed-sprint-on-issue-closed.yml

@@ -0,0 +1,25 @@
+name: Update CompletedSprint on Issue Closed
+
+on:
+  issues:
+    types: [closed]
+  pull_request:
+    types: [closed]
+
+jobs:
+  update-completed-sprint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate token
+        id: generate_token
+        uses: tibdex/github-app-token@v1
+        with:
+          app_id: ${{ secrets.GH_PROJECT_MANAGEMENT_APP_ID }}
+          private_key: ${{ secrets.GH_PROJECT_MANAGEMENT_APP_PEM }}
+      - name: Update CompletedSprint on Issue Closed
+        id: update_completedsprint_on_issue_closed
+        uses: stellar/actions/update-completed-sprint-on-issue-closed@main
+        with:
+          project_name: "Platform Scrum"
+          field_name: "CompletedSprint"
+          project_token: ${{ steps.generate_token.outputs.token }}

CHANGELOG.md

@@ -2,7 +2,58 @@
 
 As this project is pre 1.0, breaking changes may happen for minor version bumps. A breaking change will get clearly notified in this log.
 
-## 0.33.0 (Pending)
+## Pending
+
+## 0.39.0
+
+* Add SubmitTransactionResponse.ResultCodes.innerTransactionResultCode ([#466](https://github.com/stellar/java-stellar-sdk/pull/466)) 
+
+## 0.38.0
+
+* Fix android crashing related to okhttp3 ([#457](https://github.com/stellar/java-stellar-sdk/pull/457))
+
+## 0.37.2
+
+* Fix the deployment CI that uploads the jar to the GitHub release [2]. ([#453](https://github.com/stellar/java-stellar-sdk/pull/453))
+
+## 0.37.1
+
+* Fix the deployment CI that uploads the jar to the GitHub release. ([#452](https://github.com/stellar/java-stellar-sdk/pull/452))
+
+## 0.37.0
+
+* Fix missing `auth_clawback_enabled` field in AccountResponse class. ([#449](https://github.com/stellar/java-stellar-sdk/pull/449))
+
+## 0.36.0
+
+* Fix bug in `KeyPair.fromSecretSeed(char[] seed)`. ([#447](https://github.com/stellar/java-stellar-sdk/pull/447))
+* Shade kotlin dependencies to prevent 'Duplicate class' errors. ([#448](https://github.com/stellar/java-stellar-sdk/pull/448))
+
+## 0.35.0
+
+* Update JDK compatibility version from Java 1.6 to Java 1.8 and bump the version of few libraries ([#444](https://github.com/stellar/java-stellar-sdk/pull/444)):
+  * com.squareup.okhttp3 from `v3.11.0` to `v4.10.0`. 
+  * commons-io:commons-io from `v2.6` to `v2.11.0`.
+  * junit:junit from `v4.12` to `v4.13.2`.
+  * org.threeten:threetenbp from `v1.4.4` to `v1.6.0`.
+  * org.mockito:mockito-core from `v2.21.0` to `v4.6.1`.
+  * javax.xml.bind:jaxb-api from `v2.3.0` to `v2.3.1`.
+
+## 0.34.2
+
+* Bump gson version from `v2.8.5` to `v2.9.0`. ([#443](https://github.com/stellar/java-stellar-sdk/pull/443))
+
+## 0.34.1
+
+* Fix the `Sep10Challenge.verifyTransactionSignatures` method to handle/ignore signers that are not ed25519 compliant. ([#440](https://github.com/stellar/java-stellar-sdk/pull/440))
+
+## 0.34.0
+* Add memo to `Sep10Challenge.newChallenge()` and `Sep10Challenge.readChallengeTransaction`. ([#435](https://github.com/stellar/java-stellar-sdk/pull/435))
+
+## 0.33.0 
+* Update TransactionResponse to include new Protocol 19 Preconditions ([#428](https://github.com/stellar/java-stellar-sdk/pull/428)).
+* Fix asset compare to when asset code are equals ([#424](https://github.com/stellar/java-stellar-sdk/pull/424)).
+* LiquidityPoolIDDeserializer is missing from the PageDeserializer. ([#422](https://github.com/stellar/java-stellar-sdk/pull/422))
 
 ## 0.32.0
 

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.okhttpclientVersion= '3.11.0'
+    ext.okhttpclientVersion= '4.10.0'
 }
 
 plugins {
@@ -12,11 +12,15 @@ plugins {
     id "java-library"
 }
 
-sourceCompatibility = 1.8
-version = '0.32.0'
+sourceCompatibility = JavaVersion.VERSION_1_8.toString()
+version = '0.39.0'
 group = 'stellar'
 jar.enabled = false
 
+compileJava.options.encoding = 'UTF-8'
+compileTestJava.options.encoding = 'UTF-8'
+javadoc.options.encoding = 'UTF-8'
+
 publishing {
     publications {
         sdkLibrary(MavenPublication) { publication ->
@@ -35,7 +39,11 @@ shadowJar {
     duplicatesStrategy DuplicatesStrategy.EXCLUDE
     archiveClassifier.set('')
     archiveFileName.set('stellar-sdk.jar')
-    relocate 'com.','shadow.com.'
+    relocate('com.', 'shadow.com.') {
+      // okhttp hardcodes android platform class loading to this package, shadowing would attempt to rewrite the hardcode
+      // to be 'shadow.com.android.org.conscrypt' which we don't want to happen.
+      exclude 'com.android.org.conscrypt'
+    }
     relocate 'net.','shadow.net.'
     relocate 'javax.annotation', 'shadow.javax.annotation'
     relocate 'org.apache','shadow.org.apache'
@@ -45,6 +53,9 @@ shadowJar {
     relocate 'org.checkerframework','shadow.org.checkerframework'
     relocate 'okhttp3','shadow.okhttp3'
     relocate 'okio','shadow.okio'
+    relocate 'kotlin','shadow.kotlin'
+    relocate 'org.intellij','shadow.org.intellij'
+    relocate 'org.jetbrains','shadow.org.jetbrains'
 }
 
 repositories {
@@ -57,15 +68,15 @@ dependencies {
     implementation 'com.moandjiezana.toml:toml4j:0.7.2'
     // use the android version because we don't want java 8 stuff
     implementation 'com.google.guava:guava:26.0-android'
-    implementation 'com.google.code.gson:gson:2.8.5'
-    implementation 'commons-io:commons-io:2.6'
+    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'commons-io:commons-io:2.11.0'
     implementation 'net.i2p.crypto:eddsa:0.3.0'
-    implementation 'org.threeten:threetenbp:1.4.4'
+    implementation 'org.threeten:threetenbp:1.6.0'
 
-    testImplementation 'org.mockito:mockito-core:2.21.0'
+    testImplementation 'org.mockito:mockito-core:4.6.1'
     testImplementation "com.squareup.okhttp3:mockwebserver:${okhttpclientVersion}"
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'javax.xml.bind:jaxb-api:2.3.0'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'javax.xml.bind:jaxb-api:2.3.1'
     testImplementation group: 'org.junit.vintage', name: 'junit-vintage-engine', version: '4.12.1'
 }
 tasks.named('test') { task ->

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

@@ -73,7 +73,6 @@ public boolean canSign() {
   public static KeyPair fromSecretSeed(char[] seed) {
     byte[] decoded = StrKey.decodeStellarSecretSeed(seed);
     KeyPair keypair = fromSecretSeed(decoded);
-    Arrays.fill(decoded, (byte) 0);
     return keypair;
   }
 
@@ -309,7 +308,7 @@ public boolean equals(Object object) {
     }
 
     KeyPair other = (KeyPair) object;
-    return this.mPrivateKey.equals(other.mPrivateKey) &&
+    return Objects.equal(this.mPrivateKey, other.mPrivateKey) &&
             this.mPublicKey.equals(other.mPublicKey);
 
   }

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

@@ -1,7 +1,5 @@
 package org.stellar.sdk;
 
-import com.google.common.io.BaseEncoding;
-
 /**
  * <p>The memo contains optional extra information. It is the responsibility of the client to interpret this value. Memos can be one of the following types:</p>
  * <ul>
@@ -76,8 +74,7 @@ public static MemoReturnHash returnHash(byte[] bytes) {
      * @param hexString
      */
     public static MemoReturnHash returnHash(String hexString) {
-        // We change to lowercase because we want to decode both: upper cased and lower cased alphabets.
-        return new MemoReturnHash(BaseEncoding.base16().lowerCase().decode(hexString.toLowerCase()));
+        return new MemoReturnHash(hexString);
     }
 
     public static Memo fromXdr(org.stellar.sdk.xdr.Memo memo) {

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

@@ -1,19 +1,18 @@
 package org.stellar.sdk;
 
-import com.google.common.io.BaseEncoding;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.Arrays;
 
+import com.google.common.io.BaseEncoding;
+
 abstract class MemoHashAbstract extends Memo {
   protected byte[] bytes;
 
   public MemoHashAbstract(byte[] bytes) {
-    if (bytes.length < 32) {
-      bytes = Util.paddedByteArray(bytes, 32);
-    } else if (bytes.length > 32) {
-      throw new MemoTooLongException("MEMO_HASH can contain 32 bytes at max.");
-    }
-
+    checkNotNull(bytes, "bytes cannot be null");
+    checkArgument(bytes.length == 32, "bytes must be 32-bytes long.");
     this.bytes = bytes;
   }
 
@@ -34,29 +33,14 @@ public byte[] getBytes() {
    *
    * <p>Example:</p>
    * <code>
-   *   MemoHash memo = new MemoHash("4142434445");
-   *   memo.getHexValue(); // 4142434445000000000000000000000000000000000000000000000000000000
-   *   memo.getTrimmedHexValue(); // 4142434445
+   *   MemoHash memo = new MemoHash("e98869bba8bce08c10b78406202127f3888c25454cd37b02600862452751f526");
+   *   memo.getHexValue(); // e98869bba8bce08c10b78406202127f3888c25454cd37b02600862452751f526
    * </code>
    */
   public String getHexValue() {
     return BaseEncoding.base16().lowerCase().encode(this.bytes);
   }
 
-  /**
-   * <p>Returns hex representation of bytes contained in this memo until null byte (0x00) is found.</p>
-   *
-   * <p>Example:</p>
-   * <code>
-   *   MemoHash memo = new MemoHash("4142434445");
-   *   memo.getHexValue(); // 4142434445000000000000000000000000000000000000000000000000000000
-   *   memo.getTrimmedHexValue(); // 4142434445
-   * </code>
-   */
-  public String getTrimmedHexValue() {
-    return this.getHexValue().split("00")[0];
-  }
-
   @Override
   abstract org.stellar.sdk.xdr.Memo toXdr();
 
@@ -75,6 +59,6 @@ public boolean equals(Object o) {
 
     @Override
     public String toString() {
-        return bytes == null ? "" : Util.paddedByteArrayToString(bytes);
+        return bytes == null ? "" : getHexValue();
     }
 }

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

@@ -1,10 +1,11 @@
 package org.stellar.sdk;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkArgument;
+
 import org.stellar.sdk.xdr.MemoType;
 import org.stellar.sdk.xdr.XdrString;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Represents MEMO_TEXT.
  */
@@ -20,11 +21,9 @@ public MemoText(byte[] text) {
   }
 
   public MemoText(XdrString text) {
-    this.text = checkNotNull(text, "text cannot be null");
-    int length = this.text.getBytes().length;
-    if (length > 28) {
-      throw new MemoTooLongException("text must be <= 28 bytes. length=" + String.valueOf(length));
-    }
+    checkNotNull(text, "text cannot be null");
+    checkArgument(text.getBytes().length <= 28, "text cannot be more than 28-bytes long.");
+    this.text = text;
   }
 
   public String getText() {