diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38b97c99c..5616e44ce 100644
--- 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
index 97f744307..e6461db70 160000
--- a/concordium-base
+++ b/concordium-base
@@ -1 +1 @@
-Subproject commit 97f744307a8034d1f63cc420cf742e4fc5537647
+Subproject commit e6461db7032ea88157babc8ff09ea5bac4a39d68
diff --git a/crypto-jni/Cargo.lock b/crypto-jni/Cargo.lock
index 14c7324f0..aa63090e4 100644
--- a/crypto-jni/Cargo.lock
+++ b/crypto-jni/Cargo.lock
@@ -344,18 +344,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.26"
+version = "0.4.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
+checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
  "js-sys",
  "num-traits",
  "serde",
- "time 0.1.45",
  "wasm-bindgen",
- "winapi",
+ "windows-targets",
 ]
 
 [[package]]
@@ -380,7 +379,7 @@ dependencies = [
 
 [[package]]
 name = "concordium-contracts-common"
-version = "9.0.0"
+version = "9.1.0"
 dependencies = [
  "base64",
  "bs58",
@@ -400,7 +399,7 @@ dependencies = [
 
 [[package]]
 name = "concordium-contracts-common-derive"
-version = "4.0.1"
+version = "4.1.0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -409,7 +408,7 @@ dependencies = [
 
 [[package]]
 name = "concordium_base"
-version = "4.0.0"
+version = "4.1.0"
 dependencies = [
  "anyhow",
  "ark-bls12-381",
@@ -868,7 +867,7 @@ checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
 ]
 
 [[package]]
@@ -1696,7 +1695,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_with_macros",
- "time 0.3.28",
+ "time",
 ]
 
 [[package]]
@@ -1849,17 +1848,6 @@ dependencies = [
  "syn 1.0.107",
 ]
 
-[[package]]
-name = "time"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
-dependencies = [
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi",
-]
-
 [[package]]
 name = "time"
 version = "0.3.28"
@@ -1970,12 +1958,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
diff --git a/crypto-jni/src/lib.rs b/crypto-jni/src/lib.rs
index 961d5a5fb..2916b2aed 100644
--- 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),
     };