From 84c55e79798890100cccf019ca9bde6b1761d557 Mon Sep 17 00:00:00 2001 From: Oleg Koretsky Date: Mon, 22 Jul 2024 12:18:58 +0300 Subject: [PATCH 1/9] Update concordium-base to 370856b --- concordium-base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/concordium-base b/concordium-base index e6461db70..370856b55 160000 --- a/concordium-base +++ b/concordium-base @@ -1 +1 @@ -Subproject commit e6461db7032ea88157babc8ff09ea5bac4a39d68 +Subproject commit 370856b55d0d43b1d82418ed8aea7f3d08280a25 From fab371038d8624d008244ad90c00adb8483271f7 Mon Sep 17 00:00:00 2001 From: Oleg Koretsky Date: Mon, 22 Jul 2024 12:28:02 +0300 Subject: [PATCH 2/9] Add company ID attribute types --- .../accountinfo/credential/AttributeType.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/responses/accountinfo/credential/AttributeType.java b/concordium-sdk/src/main/java/com/concordium/sdk/responses/accountinfo/credential/AttributeType.java index 4ec565ba9..1b15193d0 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/responses/accountinfo/credential/AttributeType.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/responses/accountinfo/credential/AttributeType.java @@ -39,7 +39,16 @@ public enum AttributeType { @JsonProperty("taxIdNo") TAX_ID_NO, @JsonProperty("lei") - LEI; + LEI, + @JsonProperty("legalName") + LEGAL_NAME, + @JsonProperty("legalCountry") + LEGAL_COUNTRY, + @JsonProperty("businessNumber") + BUSINESS_NUMBER, + @JsonProperty("registrationAuth") + REGISTRATION_AUTH, + ; public static AttributeType fromJSON(String jsonStr) throws JsonMappingException, JsonProcessingException { return JsonMapper.INSTANCE.readValue(String.format("\"%s\"", jsonStr), AttributeType.class); From c443968f5d7839e7e5884853ac36ccb5cda7acae Mon Sep 17 00:00:00 2001 From: Oleg Koretsky Date: Mon, 22 Jul 2024 13:01:16 +0300 Subject: [PATCH 3/9] Update Android build platform to 29 So it matches the one in concordium-base wallet lib. --- concordium-android-sdk/pom.xml | 2 +- crypto-jni/Cargo.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/concordium-android-sdk/pom.xml b/concordium-android-sdk/pom.xml index bb961ec36..5da3555c9 100644 --- a/concordium-android-sdk/pom.xml +++ b/concordium-android-sdk/pom.xml @@ -265,7 +265,7 @@ true - 27 + 29 ${project.basedir}/native diff --git a/crypto-jni/Cargo.lock b/crypto-jni/Cargo.lock index aa63090e4..1d4ac3fe7 100644 --- a/crypto-jni/Cargo.lock +++ b/crypto-jni/Cargo.lock @@ -408,7 +408,7 @@ dependencies = [ [[package]] name = "concordium_base" -version = "4.1.0" +version = "5.0.0" dependencies = [ "anyhow", "ark-bls12-381", From 41bc1e539c2cf35d077188440999adbbb9c62c76 Mon Sep 17 00:00:00 2001 From: Oleg Koretsky Date: Mon, 22 Jul 2024 13:52:24 +0300 Subject: [PATCH 4/9] Update version 7.2.0-SNAPSHOT --- concordium-android-sdk/pom.xml | 2 +- concordium-sdk/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/concordium-android-sdk/pom.xml b/concordium-android-sdk/pom.xml index 5da3555c9..18701bbed 100644 --- a/concordium-android-sdk/pom.xml +++ b/concordium-android-sdk/pom.xml @@ -5,7 +5,7 @@ com.concordium.sdk concordium-sdk-base - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT concordium-android-sdk diff --git a/concordium-sdk/pom.xml b/concordium-sdk/pom.xml index ef47d432e..28f6d3dff 100644 --- a/concordium-sdk/pom.xml +++ b/concordium-sdk/pom.xml @@ -7,7 +7,7 @@ com.concordium.sdk concordium-sdk-base - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT com.concordium.sdk diff --git a/pom.xml b/pom.xml index 01e94f061..5d6499860 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.concordium.sdk concordium-sdk-base - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT pom https://github.com/Concordium/concordium-java-sdk From 5d7dac1e72ccc98306f1f8020214f0000a049a50 Mon Sep 17 00:00:00 2001 From: Oleg Koretsky Date: Tue, 23 Jul 2024 11:47:00 +0300 Subject: [PATCH 5/9] Gitignore Idea folder --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e39e4abee..495f51292 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ *.iml .flattened-pom.xml pom.xml.versionsBackup +.idea/ From 94b8edf3cb495aea942c02769810efafeb47fd74 Mon Sep 17 00:00:00 2001 From: Oleg Koretsky Date: Wed, 31 Jul 2024 16:47:52 +0300 Subject: [PATCH 6/9] Update concordium-base to 38cf687 --- concordium-base | 2 +- crypto-jni/Cargo.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/concordium-base b/concordium-base index 370856b55..38cf687f1 160000 --- a/concordium-base +++ b/concordium-base @@ -1 +1 @@ -Subproject commit 370856b55d0d43b1d82418ed8aea7f3d08280a25 +Subproject commit 38cf687f16074b9a2538093a40e2befa06cd104d diff --git a/crypto-jni/Cargo.lock b/crypto-jni/Cargo.lock index 1d4ac3fe7..1c483980d 100644 --- a/crypto-jni/Cargo.lock +++ b/crypto-jni/Cargo.lock @@ -1943,7 +1943,7 @@ dependencies = [ [[package]] name = "wallet_library" -version = "0.3.0" +version = "0.4.0" dependencies = [ "anyhow", "chrono", From 59ff0f37d6ec79ea9faa7bf10adb2efc2448cd81 Mon Sep 17 00:00:00 2001 From: Oleg Koretsky Date: Wed, 31 Jul 2024 16:50:03 +0300 Subject: [PATCH 7/9] Update the changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5942a124..4a161eaed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Unreleased - Added `MessageSigningDigest` class to generate digests for message signing +- Added support for company identity attributes ## 7.1.0 - Removed unnecessary `amount` parameter from `InvokeInstanceRequest`. From 3a2d6176b81ad3b43b6cfcbe9534333fdb57987e Mon Sep 17 00:00:00 2001 From: Oleg Koretsky Date: Wed, 31 Jul 2024 17:07:22 +0300 Subject: [PATCH 8/9] Update the base version in examples --- concordium-sdk-examples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/concordium-sdk-examples/pom.xml b/concordium-sdk-examples/pom.xml index d8b3ea9e5..94c25f5de 100644 --- a/concordium-sdk-examples/pom.xml +++ b/concordium-sdk-examples/pom.xml @@ -23,7 +23,7 @@ com.concordium.sdk concordium-sdk - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT compile From 705438a9acf30d681057ee1f19e10de9776838b1 Mon Sep 17 00:00:00 2001 From: Oleg Koretsky Date: Wed, 31 Jul 2024 17:09:34 +0300 Subject: [PATCH 9/9] Update the CI Android SDK version to 29 --- .github/workflows/build-test.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index f5e4e2ace..69395042a 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -94,7 +94,7 @@ jobs: run: | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager \ --sdk_root=$ANDROID_SDK_ROOT \ - "platform-tools" "platforms;android-27" "build-tools;27.0.3" + "platform-tools" "platforms;android-29" "build-tools;29.0.2" - name: Checkout uses: actions/checkout@v2 with: @@ -114,4 +114,4 @@ jobs: - name: Initialize root project run: mvn install -N - name: Build android sdk - run: cd concordium-android-sdk && mvn --batch-mode --update-snapshots install \ No newline at end of file + run: cd concordium-android-sdk && mvn --batch-mode --update-snapshots install diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0d37811f3..054a62c72 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -94,7 +94,7 @@ jobs: run: | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager \ --sdk_root=$ANDROID_SDK_ROOT \ - "platform-tools" "platforms;android-27" "build-tools;27.0.3" + "platform-tools" "platforms;android-29" "build-tools;29.0.2" # Setup rust - name: Setup Rust uses: actions-rs/toolchain@v1 @@ -130,7 +130,7 @@ jobs: run: | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager \ --sdk_root=$ANDROID_SDK_ROOT \ - "platform-tools" "platforms;android-27" "build-tools;27.0.3" + "platform-tools" "platforms;android-29" "build-tools;29.0.2" - name: Setup JDK 8 uses: actions/setup-java@v4 with: