diff --git a/Cargo.lock b/Cargo.lock
index 57439057a0..513985182b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11,7 +11,7 @@ checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
 [[package]]
 name = "abstract-domain-derive"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.36",
@@ -5812,7 +5812,7 @@ checksum = "1fafa6961cabd9c63bcd77a45d7e3b7f3b552b70417831fb0f56db717e72407e"
 [[package]]
 name = "move-abigen"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "anyhow",
  "bcs 0.1.4",
@@ -5829,7 +5829,7 @@ dependencies = [
 [[package]]
 name = "move-binary-format"
 version = "0.0.3"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "anyhow",
  "arbitrary",
@@ -5846,12 +5846,12 @@ dependencies = [
 [[package]]
 name = "move-borrow-graph"
 version = "0.0.1"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 
 [[package]]
 name = "move-bytecode-source-map"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "anyhow",
  "bcs 0.1.4",
@@ -5866,7 +5866,7 @@ dependencies = [
 [[package]]
 name = "move-bytecode-utils"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "anyhow",
  "move-binary-format",
@@ -5878,7 +5878,7 @@ dependencies = [
 [[package]]
 name = "move-bytecode-verifier"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "fail",
  "move-binary-format",
@@ -5892,7 +5892,7 @@ dependencies = [
 [[package]]
 name = "move-bytecode-viewer"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "anyhow",
  "clap 4.5.13",
@@ -5907,7 +5907,7 @@ dependencies = [
 [[package]]
 name = "move-cli"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "anyhow",
  "clap 4.5.13",
@@ -5937,7 +5937,7 @@ dependencies = [
 [[package]]
 name = "move-command-line-common"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "anyhow",
  "difference",
@@ -5954,7 +5954,7 @@ dependencies = [
 [[package]]
 name = "move-compiler"
 version = "0.0.1"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "anyhow",
  "bcs 0.1.4",
@@ -5980,7 +5980,7 @@ dependencies = [
 [[package]]
 name = "move-compiler-v2"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "abstract-domain-derive",
  "anyhow",
@@ -6011,7 +6011,7 @@ dependencies = [
 [[package]]
 name = "move-core-types"
 version = "0.0.4"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "anyhow",
  "arbitrary",
@@ -6038,7 +6038,7 @@ dependencies = [
 [[package]]
 name = "move-coverage"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "anyhow",
  "bcs 0.1.4",
@@ -6074,7 +6074,7 @@ dependencies = [
 [[package]]
 name = "move-disassembler"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "anyhow",
  "clap 4.5.13",
@@ -6091,7 +6091,7 @@ dependencies = [
 [[package]]
 name = "move-docgen"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "anyhow",
  "clap 4.5.13",
@@ -6110,7 +6110,7 @@ dependencies = [
 [[package]]
 name = "move-errmapgen"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "anyhow",
  "move-command-line-common",
@@ -6122,7 +6122,7 @@ dependencies = [
 [[package]]
 name = "move-ir-compiler"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "anyhow",
  "bcs 0.1.4",
@@ -6138,7 +6138,7 @@ dependencies = [
 [[package]]
 name = "move-ir-to-bytecode"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "anyhow",
  "codespan-reporting",
@@ -6156,7 +6156,7 @@ dependencies = [
 [[package]]
 name = "move-ir-to-bytecode-syntax"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "anyhow",
  "hex",
@@ -6169,7 +6169,7 @@ dependencies = [
 [[package]]
 name = "move-ir-types"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "hex",
  "move-command-line-common",
@@ -6182,7 +6182,7 @@ dependencies = [
 [[package]]
 name = "move-model"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "anyhow",
  "codespan 0.11.1",
@@ -6208,7 +6208,7 @@ dependencies = [
 [[package]]
 name = "move-package"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "anyhow",
  "clap 4.5.13",
@@ -6295,7 +6295,7 @@ dependencies = [
 [[package]]
 name = "move-prover"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "anyhow",
  "atty",
@@ -6322,7 +6322,7 @@ dependencies = [
 [[package]]
 name = "move-prover-boogie-backend"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -6351,7 +6351,7 @@ dependencies = [
 [[package]]
 name = "move-prover-bytecode-pipeline"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "abstract-domain-derive",
  "anyhow",
@@ -6368,7 +6368,7 @@ dependencies = [
 [[package]]
 name = "move-prover-test-utils"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "anyhow",
  "move-command-line-common",
@@ -6379,7 +6379,7 @@ dependencies = [
 [[package]]
 name = "move-resource-viewer"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "anyhow",
  "hex",
@@ -6392,7 +6392,7 @@ dependencies = [
 [[package]]
 name = "move-stackless-bytecode"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "abstract-domain-derive",
  "codespan-reporting",
@@ -6411,7 +6411,7 @@ dependencies = [
 [[package]]
 name = "move-stdlib"
 version = "0.1.1"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "anyhow",
  "hex",
@@ -6434,7 +6434,7 @@ dependencies = [
 [[package]]
 name = "move-symbol-pool"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "once_cell",
  "serde",
@@ -6443,7 +6443,7 @@ dependencies = [
 [[package]]
 name = "move-table-extension"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "better_any",
  "bytes 1.6.1",
@@ -6458,12 +6458,10 @@ dependencies = [
 [[package]]
 name = "move-transactional-test-runner"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "anyhow",
  "clap 4.5.13",
- "hex",
- "jpst",
  "move-binary-format",
  "move-bytecode-source-map",
  "move-command-line-common",
@@ -6482,7 +6480,6 @@ dependencies = [
  "move-vm-types",
  "once_cell",
  "regex",
- "serde_json",
  "tempfile",
  "termcolor",
 ]
@@ -6490,7 +6487,7 @@ dependencies = [
 [[package]]
 name = "move-unit-test"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "anyhow",
  "better_any",
@@ -6518,7 +6515,7 @@ dependencies = [
 [[package]]
 name = "move-vm-runtime"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "better_any",
  "bytes 1.6.1",
@@ -6542,7 +6539,7 @@ dependencies = [
 [[package]]
 name = "move-vm-test-utils"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "anyhow",
  "bytes 1.6.1",
@@ -6558,7 +6555,7 @@ dependencies = [
 [[package]]
 name = "move-vm-types"
 version = "0.1.0"
-source = "git+https://github.com/starcoinorg/move?rev=2949078ac5e8722350a2b20d0712706b592970e5#2949078ac5e8722350a2b20d0712706b592970e5"
+source = "git+https://github.com/starcoinorg/move?rev=166595c6b503c1d68fc808c78d83da32a6cdc667#166595c6b503c1d68fc808c78d83da32a6cdc667"
 dependencies = [
  "bcs 0.1.4",
  "derivative",
diff --git a/Cargo.toml b/Cargo.toml
index 919d58d67a..0fa33860ee 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -402,38 +402,38 @@ sha2_0_10_6 = { package = "sha2", version = "0.10.6" }
 siphasher = "0.3.10"
 merkletree = { version = "0.22.1" }
 mirai-annotations = "1.10.1"
-move-binary-format = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-bytecode-source-map = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-bytecode-utils = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-bytecode-verifier = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-cli = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-command-line-common = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-compiler = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-compiler-v2 = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-core-types = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-coverage = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-disassembler = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-docgen = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-errmapgen = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-ir-compiler = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-ir-types = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-model = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-package = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-prover = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-prover-boogie-backend = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-prover-bytecode-pipeline = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-stackless-bytecode = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-prover-test-utils = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-resource-viewer = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-stdlib = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-transactional-test-runner = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-unit-test = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5", features = [
+move-binary-format = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-bytecode-source-map = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-bytecode-utils = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-bytecode-verifier = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-cli = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-command-line-common = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-compiler = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-compiler-v2 = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-core-types = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-coverage = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-disassembler = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-docgen = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-errmapgen = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-ir-compiler = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-ir-types = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-model = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-package = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-prover = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-prover-boogie-backend = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-prover-bytecode-pipeline = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-stackless-bytecode = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-prover-test-utils = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-resource-viewer = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-stdlib = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-transactional-test-runner = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-unit-test = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667", features = [
     "table-extension",
 ] }
-move-vm-runtime = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-vm-types = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-table-extension = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5" }
-move-vm-test-utils = { git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5", features = [
+move-vm-runtime = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-vm-types = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-table-extension = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667" }
+move-vm-test-utils = { git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667", features = [
     "table-extension",
 ] }
 
@@ -613,7 +613,7 @@ unsigned-varint = { version = "0.6.0", features = [
     "futures",
     "asynchronous_codec",
 ] }
-vm = { package = "move-binary-format", git = "https://github.com/starcoinorg/move", rev = "2949078ac5e8722350a2b20d0712706b592970e5", features = [
+vm = { package = "move-binary-format", git = "https://github.com/starcoinorg/move", rev = "166595c6b503c1d68fc808c78d83da32a6cdc667", features = [
     "fuzzing",
 ] }
 vm-status-translator = { path = "vm/vm-status-translator" }
diff --git a/vm/starcoin-transactional-test-harness/src/lib.rs b/vm/starcoin-transactional-test-harness/src/lib.rs
index df96775dc9..7dc263cb83 100644
--- a/vm/starcoin-transactional-test-harness/src/lib.rs
+++ b/vm/starcoin-transactional-test-harness/src/lib.rs
@@ -1028,7 +1028,6 @@ impl<'a> StarcoinTestAdapter<'a> {
     }
 }
 
-#[allow(dead_code)]
 fn view_resource_in_move_storage(
     storage: StorageAdapter<ChainStateDB>,
     address: AccountAddress,
@@ -1211,7 +1210,7 @@ impl<'a> MoveTestAdapter<'a> for StarcoinTestAdapter<'a> {
         named_addr_opt: Option<Identifier>,
         gas_budget: Option<u64>,
         _extra: Self::ExtraPublishArgs,
-    ) -> anyhow::Result<(Option<String>, CompiledModule, Option<Value>)> {
+    ) -> anyhow::Result<(Option<String>, CompiledModule)> {
         let module_id = module.self_id();
         let signer = match named_addr_opt {
             Some(name) => self.compiled_state.resolve_named_address(name.as_str()),
@@ -1233,11 +1232,10 @@ impl<'a> MoveTestAdapter<'a> for StarcoinTestAdapter<'a> {
         let output = self.run_transaction(txn)?;
 
         match output.output.status {
-            TransactionStatusView::Executed => Ok((None, module, None)),
+            TransactionStatusView::Executed => Ok((None, module)),
             _ => Ok((
                 Some(format!("Publish failure: {:?}", output.output.status)),
                 module,
-                Some(serde_json::to_value(&output)?),
             )),
         }
     }
@@ -1250,7 +1248,7 @@ impl<'a> MoveTestAdapter<'a> for StarcoinTestAdapter<'a> {
         args: Vec<MoveValue>,
         gas_budget: Option<u64>,
         _extra_args: Self::ExtraRunArgs,
-    ) -> anyhow::Result<(Option<String>, Option<Value>)> {
+    ) -> anyhow::Result<Option<String>> {
         assert!(!signers.is_empty());
         if signers.len() != 1 {
             panic!("Expected 1 signer, got {}.", signers.len());
@@ -1316,10 +1314,7 @@ impl<'a> MoveTestAdapter<'a> for StarcoinTestAdapter<'a> {
             gas_used: output.output.gas_used.0,
             status: output.output.status.clone(),
         };
-        Ok((
-            Some(serde_json::to_string_pretty(&result)?),
-            Some(serde_json::to_value(&output)?),
-        ))
+        Ok(Some(serde_json::to_string_pretty(&result)?))
     }
 
     fn call_function(
@@ -1331,7 +1326,7 @@ impl<'a> MoveTestAdapter<'a> for StarcoinTestAdapter<'a> {
         args: Vec<MoveValue>,
         gas_budget: Option<u64>,
         _extra_args: Self::ExtraRunArgs,
-    ) -> anyhow::Result<(Option<String>, SerializedReturnValues, Option<Value>)> {
+    ) -> anyhow::Result<(Option<String>, SerializedReturnValues)> {
         {
             assert!(!signers.is_empty());
             if signers.len() != 1 {
@@ -1366,29 +1361,24 @@ impl<'a> MoveTestAdapter<'a> for StarcoinTestAdapter<'a> {
             mutable_reference_outputs: vec![],
             return_values: vec![],
         };
-        Ok((
-            Some(serde_json::to_string_pretty(&result)?),
-            value,
-            Some(serde_json::to_value(&output)?),
-        ))
+        Ok((Some(serde_json::to_string_pretty(&result)?), value))
     }
 
     fn view_data(
         &mut self,
-        _address: AccountAddress,
-        _module: &ModuleId,
-        _resource: &IdentStr,
-        _type_args: Vec<TypeTag>,
-    ) -> anyhow::Result<(String, Value)> {
-        let _s = StorageAdapter::new(&self.context.storage);
-        // view_resource_in_move_storage(&s, address, module, resource, type_args)
-        unimplemented!()
+        address: AccountAddress,
+        module: &ModuleId,
+        resource: &IdentStr,
+        type_args: Vec<TypeTag>,
+    ) -> anyhow::Result<String> {
+        let s = StorageAdapter::new(&self.context.storage);
+        view_resource_in_move_storage(s, address, module, resource, type_args)
     }
 
     fn handle_subcommand(
         &mut self,
         subcommand: TaskInput<Self::Subcommand>,
-    ) -> anyhow::Result<(Option<String>, Option<Value>)> {
+    ) -> anyhow::Result<Option<String>> {
         let (result_str, cmd_var_ctx) = match subcommand.command {
             StarcoinSubcommands::Faucet {
                 address,
@@ -1428,7 +1418,7 @@ impl<'a> MoveTestAdapter<'a> for StarcoinTestAdapter<'a> {
                 eprintln!("{}: {}", subcommand.name, cmd_var_ctx);
             }
         }
-        Ok((result_str, cmd_var_ctx))
+        Ok(result_str)
     }
 }
 
diff --git a/vm/starcoin-transactional-test-harness/tests/cases/arg_variable.exp b/vm/starcoin-transactional-test-harness/tests/cases/arg_variable.exp
index 8a5f3e1b4b..a40d21a6ef 100644
--- a/vm/starcoin-transactional-test-harness/tests/cases/arg_variable.exp
+++ b/vm/starcoin-transactional-test-harness/tests/cases/arg_variable.exp
@@ -7,35 +7,40 @@ task 3 'run'. lines 7-7:
 }
 
 task 4 'view'. lines 9-9:
-key 0x00000000000000000000000000000001::Account::Account {
+store key 0x00000000000000000000000000000001::account::Account {
     authentication_key: f90391c81027f03cdea491ed8b36ffaced26b6df208a9b569e5baf2590eb9b16
-    withdrawal_capability: copy drop store 0x00000000000000000000000000000001::Option::Option<0x00000000000000000000000000000001::Account::WithdrawCapability> {
-        vec: [
-            store 0x00000000000000000000000000000001::Account::WithdrawCapability {
-                account_address: 662ba5a1a1da0f1c70a9762c7eeb7aaf
-            },
-        ]
-    }
-    key_rotation_capability: copy drop store 0x00000000000000000000000000000001::Option::Option<0x00000000000000000000000000000001::Account::KeyRotationCapability> {
-        vec: [
-            store 0x00000000000000000000000000000001::Account::KeyRotationCapability {
-                account_address: 662ba5a1a1da0f1c70a9762c7eeb7aaf
-            },
-        ]
-    }
-    withdraw_events: store 0x00000000000000000000000000000001::Event::EventHandle<0x00000000000000000000000000000001::Account::WithdrawEvent> {
+    sequence_number: 1
+    guid_creation_num: 0
+    coin_register_events: store 0x00000000000000000000000000000001::event::EventHandle<0x00000000000000000000000000000001::account::CoinRegisterEvent> {
         counter: 0
-        guid: 0000000000000000662ba5a1a1da0f1c70a9762c7eeb7aaf
+        guid: drop store 0x00000000000000000000000000000001::guid::GUID {
+            id: copy drop store 0x00000000000000000000000000000001::guid::ID {
+                creation_num: 0
+                addr: 662ba5a1a1da0f1c70a9762c7eeb7aaf
+            }
+        }
     }
-    deposit_events: store 0x00000000000000000000000000000001::Event::EventHandle<0x00000000000000000000000000000001::Account::DepositEvent> {
+    key_rotation_events: store 0x00000000000000000000000000000001::event::EventHandle<0x00000000000000000000000000000001::account::KeyRotationEvent> {
         counter: 0
-        guid: 0100000000000000662ba5a1a1da0f1c70a9762c7eeb7aaf
+        guid: drop store 0x00000000000000000000000000000001::guid::GUID {
+            id: copy drop store 0x00000000000000000000000000000001::guid::ID {
+                creation_num: 1
+                addr: 662ba5a1a1da0f1c70a9762c7eeb7aaf
+            }
+        }
     }
-    accept_token_events: store 0x00000000000000000000000000000001::Event::EventHandle<0x00000000000000000000000000000001::Account::AcceptTokenEvent> {
-        counter: 0
-        guid: 0100000000000000662ba5a1a1da0f1c70a9762c7eeb7aaf
+    rotation_capability_offer: store 0x00000000000000000000000000000001::account::CapabilityOffer<0x00000000000000000000000000000001::account::RotationCapability> {
+        for: copy drop store 0x00000000000000000000000000000001::option::Option<address> {
+            vec: [
+            ]
+        }
+    }
+    signer_capability_offer: store 0x00000000000000000000000000000001::account::CapabilityOffer<0x00000000000000000000000000000001::account::SignerCapability> {
+        for: copy drop store 0x00000000000000000000000000000001::option::Option<address> {
+            vec: [
+            ]
+        }
     }
-    sequence_number: 1
 }
 
 task 5 'run'. lines 11-17:
diff --git a/vm/starcoin-transactional-test-harness/tests/cases/arg_variable.move.ignored b/vm/starcoin-transactional-test-harness/tests/cases/arg_variable.move
similarity index 80%
rename from vm/starcoin-transactional-test-harness/tests/cases/arg_variable.move.ignored
rename to vm/starcoin-transactional-test-harness/tests/cases/arg_variable.move
index 5b4b2720b6..61a720ace1 100644
--- a/vm/starcoin-transactional-test-harness/tests/cases/arg_variable.move.ignored
+++ b/vm/starcoin-transactional-test-harness/tests/cases/arg_variable.move
@@ -8,7 +8,7 @@
 
 //# view --address creator --resource 0x1::account::Account
 
-//# run --signers creator --args {{$.block[0].number}}  --args {{$.view[0].sequence_number}}
+//# run --signers creator --args 2  --args 1
 script {
     fun main(_sender: signer, block_number: u64, sequence_number: u64) {
         assert!(block_number == 2, 1000);
diff --git a/vm/starcoin-transactional-test-harness/tests/cases/call_api_cmd.exp b/vm/starcoin-transactional-test-harness/tests/cases/call_api_cmd.exp
deleted file mode 100644
index 6d1cfb7a18..0000000000
--- a/vm/starcoin-transactional-test-harness/tests/cases/call_api_cmd.exp
+++ /dev/null
@@ -1,13 +0,0 @@
-processed 10 tasks
-
-task 5 'run'. lines 11-19:
-{
-  "gas_used": 11125,
-  "status": "Executed"
-}
-
-task 9 'run'. lines 27-33:
-{
-  "gas_used": 8699,
-  "status": "Executed"
-}
diff --git a/vm/starcoin-transactional-test-harness/tests/cases/call_api_cmd.move.ignored b/vm/starcoin-transactional-test-harness/tests/cases/call_api_cmd.move.ignored
deleted file mode 100644
index bbb14cce5d..0000000000
--- a/vm/starcoin-transactional-test-harness/tests/cases/call_api_cmd.move.ignored
+++ /dev/null
@@ -1,33 +0,0 @@
-//# init -n dev
-
-//# faucet --addr creator --amount 100000000000
-
-//# block --author=0x2
-
-//# call-api chain.get_block_by_number [1]
-
-//# call-api state.get_with_proof_by_root_raw ["0x1/1/0x1::account::Account","{{$.call-api[0].header.state_root}}"]
-
-//# run --signers creator --args {{$.call-api[0].header.number}}u64  --args  "{{$.call-api[0].header.block_hash}}" --args "{{$.call-api[1]}}"
-script{
-     use std::vector;
-     fun main(_sender: signer, block_number: u64, block_hash: vector<u8>, state_proof: vector<u8>){
-         assert!(block_number == 1, 1000);
-         assert!(vector::length(&block_hash) == 32, 1001);
-         assert!(vector::length(&state_proof) > 32, 1002);
-     }
-}
-
-//# call-api chain.info
-
-//# block --author=0x3
-
-//# call-api chain.info
-
-//# run --signers creator --args b"{{$.call-api[2].head.block_hash}}" --args "{{$.call-api[3].head.parent_hash}}"
-script {
-    fun latest(_account: signer, parent_hash: vector<u8>, expect_parent_hash: vector<u8>) {
-        assert!(parent_hash == expect_parent_hash, 1003)
-    }
-}
-// check: EXECUTED
\ No newline at end of file
diff --git a/vm/starcoin-transactional-test-harness/tests/cases/call_api_cmd_barnard.exp b/vm/starcoin-transactional-test-harness/tests/cases/call_api_cmd_barnard.exp
deleted file mode 100644
index 6cd67db3f6..0000000000
--- a/vm/starcoin-transactional-test-harness/tests/cases/call_api_cmd_barnard.exp
+++ /dev/null
@@ -1 +0,0 @@
-processed 1 task
diff --git a/vm/starcoin-transactional-test-harness/tests/cases/call_api_cmd_barnard.move b/vm/starcoin-transactional-test-harness/tests/cases/call_api_cmd_barnard.move
deleted file mode 100644
index cda21e6965..0000000000
--- a/vm/starcoin-transactional-test-harness/tests/cases/call_api_cmd_barnard.move
+++ /dev/null
@@ -1,18 +0,0 @@
-//# init -n dev 
-
-// TODO: this test need the new StateApi `get_state_node_by_node_hash` updated on barnard net.
-// //# init --rpc http://barnard.seed.starcoin.org  --block-number 6487000
-
-// //# faucet --addr creator --amount 100000000000
-
-// //# call-api chain.get_block_by_number [6487000]
-
-// //# run --signers creator --args {{$.call-api[0].header.number}}u64  --args {{$.call-api[0].header.block_hash}}
-// script{
-//     use StarcoinFramework::Vector;
-//     fun main(_sender: signer, block_number: u64, block_hash: vector<u8>){
-//         assert!(block_number == 6487000, 1000);
-//         assert!(vector::length(&block_hash) == 32, 1001);
-//         assert!(x"58d3b6aa35ba1f52c809382b876950b6038c4ce9fa078358c0fcf0b072e5ae3d" == block_hash, 1002);
-//     }
-// }
\ No newline at end of file
diff --git a/vm/starcoin-transactional-test-harness/tests/cases/call_api_cmd_halley.exp b/vm/starcoin-transactional-test-harness/tests/cases/call_api_cmd_halley.exp
deleted file mode 100644
index 878d67d4d6..0000000000
--- a/vm/starcoin-transactional-test-harness/tests/cases/call_api_cmd_halley.exp
+++ /dev/null
@@ -1,7 +0,0 @@
-processed 4 tasks
-
-task 3 'run'. lines 7-14:
-{
-  "gas_used": 8712,
-  "status": "Executed"
-}
diff --git a/vm/starcoin-transactional-test-harness/tests/cases/call_api_cmd_halley.move.ignored b/vm/starcoin-transactional-test-harness/tests/cases/call_api_cmd_halley.move.ignored
deleted file mode 100644
index b601991892..0000000000
--- a/vm/starcoin-transactional-test-harness/tests/cases/call_api_cmd_halley.move.ignored
+++ /dev/null
@@ -1,14 +0,0 @@
-//# init --rpc http://halley.seed.starcoin.org  --block-number 1
-
-//# faucet --addr creator --amount 100000000000
-
-//# call-api chain.get_block_by_number [1]
-
-//# run --signers creator --args {{$.call-api[0].header.number}}u64  --args "{{$.call-api[0].header.block_hash}}"
-script{
-    use std::vector;
-    fun main(_sender: signer, block_number: u64, block_hash: vector<u8>){
-        assert!(block_number == 1, 1000);
-        assert!(vector::length(&block_hash) == 32, 1001);
-    }
-}
\ No newline at end of file
diff --git a/vm/starcoin-transactional-test-harness/tests/cases/package_deploy_cmd.exp b/vm/starcoin-transactional-test-harness/tests/cases/package_deploy_cmd.exp
index 5e5d353b5d..50a9e070a9 100644
--- a/vm/starcoin-transactional-test-harness/tests/cases/package_deploy_cmd.exp
+++ b/vm/starcoin-transactional-test-harness/tests/cases/package_deploy_cmd.exp
@@ -1,6 +1,6 @@
-processed 5 tasks
+processed 4 tasks
 
-task 4 'run'. lines 12-18:
+task 3 'run'. lines 10-16:
 {
   "gas_used": 11344,
   "status": "Executed"
diff --git a/vm/starcoin-transactional-test-harness/tests/cases/package_deploy_cmd.move b/vm/starcoin-transactional-test-harness/tests/cases/package_deploy_cmd.move
index f93b7129dc..9e637c2329 100644
--- a/vm/starcoin-transactional-test-harness/tests/cases/package_deploy_cmd.move
+++ b/vm/starcoin-transactional-test-harness/tests/cases/package_deploy_cmd.move
@@ -2,13 +2,11 @@
 
 //# faucet --addr creator --amount 100000000000
 
-//# package
+//# publish
 module creator::test {
     public fun hello(){}   
 }
 
-//# deploy {{$.package[0].file}}
-
 //# run --signers creator
 script{
     use creator::test;
diff --git a/vm/starcoin-transactional-test-harness/tests/cases/var.move b/vm/starcoin-transactional-test-harness/tests/cases/var.move
index 3ecb6116ed..6225d05376 100644
--- a/vm/starcoin-transactional-test-harness/tests/cases/var.move
+++ b/vm/starcoin-transactional-test-harness/tests/cases/var.move
@@ -6,7 +6,7 @@
 
 //# var a=123 addr={{$.faucet[0].txn.raw_txn.decoded_payload.ScriptFunction.args[0]}}
 
-//#run --signers creator --args {{$.var[0].a}}u64 --args @{{$.var[0].addr}} --args {{$.read-json[0].id}}u64
+//#run --signers creator --args 123 --args @creator --args 253
 script {
      fun main(_sender: signer, number: u64, addr: address, id: u64) {
           assert!(number == 123, 101);