diff --git a/Cargo.lock b/Cargo.lock
index ed155aaf4..af79e16d5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -799,7 +799,7 @@ dependencies = [
 [[package]]
 name = "clarity"
 version = "2.3.0"
-source = "git+https://github.com/stacks-network/stacks-core.git?branch=feat/clarity-wasm-develop#bf313524b76b1deae5ab8b3e73685d5ec86051ef"
+source = "git+https://github.com/stacks-network/stacks-core.git?branch=feat/clarity-wasm-develop#38bd7d24ab7b8fe9b3575fc1c8afe6dc5803e8a7"
 dependencies = [
  "getrandom 0.2.8",
  "hashbrown 0.14.3",
@@ -2643,7 +2643,7 @@ dependencies = [
 [[package]]
 name = "libstackerdb"
 version = "0.0.1"
-source = "git+https://github.com/stacks-network/stacks-core.git?branch=feat/clarity-wasm-develop#bf313524b76b1deae5ab8b3e73685d5ec86051ef"
+source = "git+https://github.com/stacks-network/stacks-core.git?branch=feat/clarity-wasm-develop#38bd7d24ab7b8fe9b3575fc1c8afe6dc5803e8a7"
 dependencies = [
  "clarity",
  "secp256k1 0.24.3",
@@ -3291,7 +3291,7 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 [[package]]
 name = "pox-locking"
 version = "2.4.0"
-source = "git+https://github.com/stacks-network/stacks-core.git?branch=feat/clarity-wasm-develop#bf313524b76b1deae5ab8b3e73685d5ec86051ef"
+source = "git+https://github.com/stacks-network/stacks-core.git?branch=feat/clarity-wasm-develop#38bd7d24ab7b8fe9b3575fc1c8afe6dc5803e8a7"
 dependencies = [
  "clarity",
  "slog",
@@ -4552,7 +4552,7 @@ dependencies = [
 [[package]]
 name = "stacks-common"
 version = "0.0.2"
-source = "git+https://github.com/stacks-network/stacks-core.git?branch=feat/clarity-wasm-develop#bf313524b76b1deae5ab8b3e73685d5ec86051ef"
+source = "git+https://github.com/stacks-network/stacks-core.git?branch=feat/clarity-wasm-develop#38bd7d24ab7b8fe9b3575fc1c8afe6dc5803e8a7"
 dependencies = [
  "chrono",
  "curve25519-dalek 2.0.0",
@@ -4650,7 +4650,7 @@ dependencies = [
 [[package]]
 name = "stackslib"
 version = "0.0.1"
-source = "git+https://github.com/stacks-network/stacks-core.git?branch=feat/clarity-wasm-develop#bf313524b76b1deae5ab8b3e73685d5ec86051ef"
+source = "git+https://github.com/stacks-network/stacks-core.git?branch=feat/clarity-wasm-develop#38bd7d24ab7b8fe9b3575fc1c8afe6dc5803e8a7"
 dependencies = [
  "chrono",
  "clar2wasm",
diff --git a/components/clarity-repl/src/repl/datastore.rs b/components/clarity-repl/src/repl/datastore.rs
index 22b189511..dbb34af36 100644
--- a/components/clarity-repl/src/repl/datastore.rs
+++ b/components/clarity-repl/src/repl/datastore.rs
@@ -364,7 +364,7 @@ impl Datastore {
 
         let sortition_lookup = HashMap::from([(sortition_id, id)]);
         let consensus_hash_lookup = HashMap::from([(genesis_block.consensus_hash, sortition_id)]);
-        let tenure_blocks_height = HashMap::from([0, 0]);
+        let tenure_blocks_height = HashMap::from([(0, 0)]);
         let burn_blocks = HashMap::from([(first_burn_block_header_hash, genesis_burn_block)]);
         let stacks_blocks = HashMap::from([(id, genesis_block)]);
 
@@ -598,10 +598,10 @@ impl HeadersDB for Datastore {
 
     fn get_stacks_height_for_tenure_height(
         &self,
-        id_bhh: &StacksBlockId,
-        _tenure_height: u32,
+        _id_bhh: &StacksBlockId,
+        tenure_height: u32,
     ) -> Option<u32> {
-        self.tenure_blocks_height.get(&tenure_height)
+        self.tenure_blocks_height.get(&tenure_height).copied()
     }
 
     fn get_miner_address(