From f56b5d58c66f7304bd3ebf663139a332c07c91f5 Mon Sep 17 00:00:00 2001 From: Bernie Dolan Date: Wed, 31 May 2023 12:45:11 -0700 Subject: [PATCH] Update MobileCoin payments and enclave values. --- .../payments/MobileCoinMainNetConfig.java | 18 +++---- .../payments/MobileCoinTestNetConfig.java | 8 ++++ dependencies.gradle | 2 +- gradle/verification-metadata.xml | 48 +++++++++---------- 4 files changed, 42 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/MobileCoinMainNetConfig.java b/app/src/main/java/org/thoughtcrime/securesms/payments/MobileCoinMainNetConfig.java index a63f36e4d0..254511b63c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/payments/MobileCoinMainNetConfig.java +++ b/app/src/main/java/org/thoughtcrime/securesms/payments/MobileCoinMainNetConfig.java @@ -71,15 +71,7 @@ final class MobileCoinMainNetConfig extends MobileCoinConfig { try { Set trustRoots = getTrustRoots(R.raw.signal_mobilecoin_authority); ClientConfig config = new ClientConfig(); - VerifierFactory verifierFactory = new VerifierFactory(// ~July 8th, 2022 - new ServiceConfig( - "733080d6ece4504f66ba606fa8163dae0a5220f3dbf6ca55fbafbac12c6f1897", - "660103d766cde0fd1e1cfb443b99e52da2ce0617d0dee42f8b875f7104942c6b", - "ed8ed6e1b4b6827e5543b25c1c13b9c06b478d819f8df912eb11fa140780fc51", - "c64a3b04348b10596442868758875f312dc3a755b450805149774a091d2822d3", - new String[] { "INTEL-SA-00334" } - ), - // ~August 10th, 2022 + VerifierFactory verifierFactory = new VerifierFactory(// ~August 10th, 2022 new ServiceConfig( "d6e54e43c368f0fa2c5f13361afd303ee8f890424e99bd6c367f6164b5fff1b5", "3e9bf61f3191add7b054f0e591b62f832854606f6594fd63faef1e2aedec4021", @@ -102,6 +94,14 @@ final class MobileCoinMainNetConfig extends MobileCoinConfig { "8c80a2b95a549fa8d928dd0f0771be4f3d774408c0f98bf670b1a2c390706bf3", "da209f4b24e8f4471bd6440c4e9f1b3100f1da09e2836d236e285b274901ed3b", new String[] { "INTEL-SA-00334", "INTEL-SA-00615", "INTEL-SA-00657" } + ), + // ~May 30, 2023 + new ServiceConfig( + "cd86d300c78f74ec23558cdaf734f90dd3e1bcdf8ae43fc827c6b4734ccb8862", + "7d10f5e72cacc87a6027b2be42ed4a74a6370a03c3476be754933eb18c404b0b", + "1dee8e2e98b7dc684506991d62856b2e572a0c23f5a7d698086e62f08fb997cc", + "e94f6e6557b3fb85b27d804e2d005ee14a564cc50fc477797f2e5f9984b0bd79", + new String[] { "INTEL-SA-00334", "INTEL-SA-00615", "INTEL-SA-00657" } )); diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/MobileCoinTestNetConfig.java b/app/src/main/java/org/thoughtcrime/securesms/payments/MobileCoinTestNetConfig.java index 380b79702a..c30b96b287 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/payments/MobileCoinTestNetConfig.java +++ b/app/src/main/java/org/thoughtcrime/securesms/payments/MobileCoinTestNetConfig.java @@ -66,6 +66,14 @@ final class MobileCoinTestNetConfig extends MobileCoinConfig { "23ececb2482e3b1d9e284502e2beb65ae76492f2791f3bfef50852ee64b883c3", "f52b3dc018195eae42f543e64e976c818c06672b5489746e2bf74438d488181b", new String[] { "INTEL-SA-00334", "INTEL-SA-00615", "INTEL-SA-00657" } + ), + // ~May 30, 2023 + new ServiceConfig( + "5341c6702a3312243c0f049f87259352ff32aa80f0f6426351c3dd063d817d7a", + "248356aa0d3431abc45da1773cfd6191a4f2989a4a99da31f450bd7c461e312b", + "ac292a1ad27c0338a5159d5fab2bed3917ea144536cb13b5c1226d09a2fbc648", + "b61188a6c946557f32e612eff5615908abd1b72ec11d8b7070595a92d4abbbf1", + new String[] { "INTEL-SA-00334", "INTEL-SA-00615", "INTEL-SA-00657" } )); config.logAdapter = new MobileCoinLogAdapter(); diff --git a/dependencies.gradle b/dependencies.gradle index 98161b49e6..666e0744bc 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -126,7 +126,7 @@ dependencyResolutionManagement { alias('rxjava3-rxkotlin').to('io.reactivex.rxjava3:rxkotlin:3.0.1') alias('rxdogtag').to('com.uber.rxdogtag2:rxdogtag:2.0.1') alias('conscrypt-android').to('org.conscrypt:conscrypt-android:2.0.0') - alias('mobilecoin').to('com.mobilecoin:android-sdk:4.1.0') + alias('mobilecoin').to('com.mobilecoin:android-sdk:5.0.0') alias('leolin-shortcutbadger').to('me.leolin:ShortcutBadger:1.1.22') alias('emilsjolander-stickylistheaders').to('se.emilsjolander:stickylistheaders:2.7.0') alias('jpardogo-materialtabstrip').to('com.jpardogo.materialtabstrip:library:1.0.9') diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 360f5472f1..3ec69b30e0 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -3599,14 +3599,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - - + + + @@ -4218,9 +4218,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -4228,9 +4228,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -4238,9 +4238,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -4248,9 +4248,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -4263,9 +4263,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -4273,9 +4273,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + +