Change concordium-base submodule to main + update CHANGELOG

Concordium · Mar 13, 2024 · e8ef295 · e8ef295
1 parent 175c85b
commit e8ef295
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - Added method `findAtLowestHeight` for finding the earliest block satisfying some condition.
 - Added method `findAccountCreation` for finding the block in which an account was created.
 - Fixed an issue where `ConcordiumHdWallet.fromSeedPhrase` always produced an invalid seed as hex.
+- Added `AcceptableRequest` class with `acceptableRequest` and `acceptableAtomicStatement` to check if a request satisfies wallet rules.
 
 ## 7.0.0
 - Make the `energy` parameter for invoking an instance `Optional`.

diff --git a/concordium-base b/concordium-base
diff --git a/crypto-jni/Cargo.lock b/crypto-jni/Cargo.lock
diff --git a/crypto-jni/src/lib.rs b/crypto-jni/src/lib.rs
@@ -1358,7 +1358,7 @@ pub extern "system" fn Java_com_concordium_sdk_crypto_CryptoJniNative_isAcceptab
             Err(err) => return StringResult::from(err).to_jstring(&env),
         };
 
-    match request.acceptable_request(&wallet_library::statement::get_default_wallet_config()) {
+    match request.acceptable_request(&wallet_library::default_wallet_config::default_wallet_config()) {
         Ok(r) => r,
         Err(err) => return StringResult::from(err).to_jstring(&env),
     };
@@ -1457,7 +1457,7 @@ pub extern "system" fn Java_com_concordium_sdk_crypto_CryptoJniNative_isAcceptab
         _marker: std::marker::PhantomData,
     };
 
-    match request.acceptable_atomic_statement(&Some(rules)) {
+    match request.acceptable_atomic_statement(Some(rules).as_ref()) {
         Ok(r) => r,
         Err(err) => return StringResult::from(err).to_jstring(&env),
     };