diff --git a/Cargo.lock b/Cargo.lock
index 119fddd3..63f36edc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1455,7 +1455,7 @@ dependencies = [
 [[package]]
 name = "gw-block-producer"
 version = "0.8.0"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=ffc4f42c947ccc49bf404f97ff862e2944ff5588#ffc4f42c947ccc49bf404f97ff862e2944ff5588"
+source = "git+https://github.com/nervosnetwork/godwoken.git?rev=acc66142052a7ef5d38aa58e2f4c83d1ef4bab60#acc66142052a7ef5d38aa58e2f4c83d1ef4bab60"
 dependencies = [
  "anyhow",
  "async-channel",
@@ -1507,7 +1507,7 @@ dependencies = [
 [[package]]
 name = "gw-chain"
 version = "0.1.0"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=ffc4f42c947ccc49bf404f97ff862e2944ff5588#ffc4f42c947ccc49bf404f97ff862e2944ff5588"
+source = "git+https://github.com/nervosnetwork/godwoken.git?rev=acc66142052a7ef5d38aa58e2f4c83d1ef4bab60#acc66142052a7ef5d38aa58e2f4c83d1ef4bab60"
 dependencies = [
  "anyhow",
  "ckb-fixed-hash",
@@ -1533,7 +1533,7 @@ dependencies = [
 [[package]]
 name = "gw-challenge"
 version = "0.1.0"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=ffc4f42c947ccc49bf404f97ff862e2944ff5588#ffc4f42c947ccc49bf404f97ff862e2944ff5588"
+source = "git+https://github.com/nervosnetwork/godwoken.git?rev=acc66142052a7ef5d38aa58e2f4c83d1ef4bab60#acc66142052a7ef5d38aa58e2f4c83d1ef4bab60"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -1565,7 +1565,7 @@ dependencies = [
 [[package]]
 name = "gw-ckb-hardfork"
 version = "0.1.0"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=ffc4f42c947ccc49bf404f97ff862e2944ff5588#ffc4f42c947ccc49bf404f97ff862e2944ff5588"
+source = "git+https://github.com/nervosnetwork/godwoken.git?rev=acc66142052a7ef5d38aa58e2f4c83d1ef4bab60#acc66142052a7ef5d38aa58e2f4c83d1ef4bab60"
 dependencies = [
  "arc-swap",
  "ckb-types",
@@ -1576,7 +1576,7 @@ dependencies = [
 [[package]]
 name = "gw-common"
 version = "0.1.0"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=ffc4f42c947ccc49bf404f97ff862e2944ff5588#ffc4f42c947ccc49bf404f97ff862e2944ff5588"
+source = "git+https://github.com/nervosnetwork/godwoken.git?rev=acc66142052a7ef5d38aa58e2f4c83d1ef4bab60#acc66142052a7ef5d38aa58e2f4c83d1ef4bab60"
 dependencies = [
  "cfg-if 0.1.10",
  "gw-hash",
@@ -1589,7 +1589,7 @@ dependencies = [
 [[package]]
 name = "gw-config"
 version = "0.1.0"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=ffc4f42c947ccc49bf404f97ff862e2944ff5588#ffc4f42c947ccc49bf404f97ff862e2944ff5588"
+source = "git+https://github.com/nervosnetwork/godwoken.git?rev=acc66142052a7ef5d38aa58e2f4c83d1ef4bab60#acc66142052a7ef5d38aa58e2f4c83d1ef4bab60"
 dependencies = [
  "ckb-fixed-hash",
  "gw-jsonrpc-types",
@@ -1600,7 +1600,7 @@ dependencies = [
 [[package]]
 name = "gw-db"
 version = "0.1.0"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=ffc4f42c947ccc49bf404f97ff862e2944ff5588#ffc4f42c947ccc49bf404f97ff862e2944ff5588"
+source = "git+https://github.com/nervosnetwork/godwoken.git?rev=acc66142052a7ef5d38aa58e2f4c83d1ef4bab60#acc66142052a7ef5d38aa58e2f4c83d1ef4bab60"
 dependencies = [
  "ckb-rocksdb",
  "gw-config",
@@ -1614,7 +1614,7 @@ dependencies = [
 [[package]]
 name = "gw-dynamic-config"
 version = "0.1.0"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=ffc4f42c947ccc49bf404f97ff862e2944ff5588#ffc4f42c947ccc49bf404f97ff862e2944ff5588"
+source = "git+https://github.com/nervosnetwork/godwoken.git?rev=acc66142052a7ef5d38aa58e2f4c83d1ef4bab60#acc66142052a7ef5d38aa58e2f4c83d1ef4bab60"
 dependencies = [
  "anyhow",
  "ckb-fixed-hash",
@@ -1629,7 +1629,7 @@ dependencies = [
 [[package]]
 name = "gw-eoa-mapping"
 version = "0.1.0"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=ffc4f42c947ccc49bf404f97ff862e2944ff5588#ffc4f42c947ccc49bf404f97ff862e2944ff5588"
+source = "git+https://github.com/nervosnetwork/godwoken.git?rev=acc66142052a7ef5d38aa58e2f4c83d1ef4bab60#acc66142052a7ef5d38aa58e2f4c83d1ef4bab60"
 dependencies = [
  "anyhow",
  "gw-common",
@@ -1642,7 +1642,7 @@ dependencies = [
 [[package]]
 name = "gw-generator"
 version = "0.2.0"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=ffc4f42c947ccc49bf404f97ff862e2944ff5588#ffc4f42c947ccc49bf404f97ff862e2944ff5588"
+source = "git+https://github.com/nervosnetwork/godwoken.git?rev=acc66142052a7ef5d38aa58e2f4c83d1ef4bab60#acc66142052a7ef5d38aa58e2f4c83d1ef4bab60"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -1670,7 +1670,7 @@ dependencies = [
 [[package]]
 name = "gw-hash"
 version = "0.1.0"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=ffc4f42c947ccc49bf404f97ff862e2944ff5588#ffc4f42c947ccc49bf404f97ff862e2944ff5588"
+source = "git+https://github.com/nervosnetwork/godwoken.git?rev=acc66142052a7ef5d38aa58e2f4c83d1ef4bab60#acc66142052a7ef5d38aa58e2f4c83d1ef4bab60"
 dependencies = [
  "blake2b-ref",
 ]
@@ -1678,7 +1678,7 @@ dependencies = [
 [[package]]
 name = "gw-jsonrpc-types"
 version = "0.1.0"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=ffc4f42c947ccc49bf404f97ff862e2944ff5588#ffc4f42c947ccc49bf404f97ff862e2944ff5588"
+source = "git+https://github.com/nervosnetwork/godwoken.git?rev=acc66142052a7ef5d38aa58e2f4c83d1ef4bab60#acc66142052a7ef5d38aa58e2f4c83d1ef4bab60"
 dependencies = [
  "anyhow",
  "ckb-fixed-hash",
@@ -1692,7 +1692,7 @@ dependencies = [
 [[package]]
 name = "gw-mem-pool"
 version = "0.1.0"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=ffc4f42c947ccc49bf404f97ff862e2944ff5588#ffc4f42c947ccc49bf404f97ff862e2944ff5588"
+source = "git+https://github.com/nervosnetwork/godwoken.git?rev=acc66142052a7ef5d38aa58e2f4c83d1ef4bab60#acc66142052a7ef5d38aa58e2f4c83d1ef4bab60"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -1717,7 +1717,7 @@ dependencies = [
 [[package]]
 name = "gw-rpc-client"
 version = "0.1.0"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=ffc4f42c947ccc49bf404f97ff862e2944ff5588#ffc4f42c947ccc49bf404f97ff862e2944ff5588"
+source = "git+https://github.com/nervosnetwork/godwoken.git?rev=acc66142052a7ef5d38aa58e2f4c83d1ef4bab60#acc66142052a7ef5d38aa58e2f4c83d1ef4bab60"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -1749,7 +1749,7 @@ dependencies = [
 [[package]]
 name = "gw-rpc-server"
 version = "0.1.0"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=ffc4f42c947ccc49bf404f97ff862e2944ff5588#ffc4f42c947ccc49bf404f97ff862e2944ff5588"
+source = "git+https://github.com/nervosnetwork/godwoken.git?rev=acc66142052a7ef5d38aa58e2f4c83d1ef4bab60#acc66142052a7ef5d38aa58e2f4c83d1ef4bab60"
 dependencies = [
  "anyhow",
  "async-channel",
@@ -1796,7 +1796,7 @@ dependencies = [
 [[package]]
 name = "gw-rpc-ws-server"
 version = "0.1.0"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=ffc4f42c947ccc49bf404f97ff862e2944ff5588#ffc4f42c947ccc49bf404f97ff862e2944ff5588"
+source = "git+https://github.com/nervosnetwork/godwoken.git?rev=acc66142052a7ef5d38aa58e2f4c83d1ef4bab60#acc66142052a7ef5d38aa58e2f4c83d1ef4bab60"
 dependencies = [
  "anyhow",
  "async-channel",
@@ -1820,7 +1820,7 @@ dependencies = [
 [[package]]
 name = "gw-store"
 version = "0.1.0"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=ffc4f42c947ccc49bf404f97ff862e2944ff5588#ffc4f42c947ccc49bf404f97ff862e2944ff5588"
+source = "git+https://github.com/nervosnetwork/godwoken.git?rev=acc66142052a7ef5d38aa58e2f4c83d1ef4bab60#acc66142052a7ef5d38aa58e2f4c83d1ef4bab60"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -1877,7 +1877,7 @@ dependencies = [
 [[package]]
 name = "gw-traits"
 version = "0.1.0"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=ffc4f42c947ccc49bf404f97ff862e2944ff5588#ffc4f42c947ccc49bf404f97ff862e2944ff5588"
+source = "git+https://github.com/nervosnetwork/godwoken.git?rev=acc66142052a7ef5d38aa58e2f4c83d1ef4bab60#acc66142052a7ef5d38aa58e2f4c83d1ef4bab60"
 dependencies = [
  "gw-common",
  "gw-db",
@@ -1887,7 +1887,7 @@ dependencies = [
 [[package]]
 name = "gw-tx-filter"
 version = "0.1.0"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=ffc4f42c947ccc49bf404f97ff862e2944ff5588#ffc4f42c947ccc49bf404f97ff862e2944ff5588"
+source = "git+https://github.com/nervosnetwork/godwoken.git?rev=acc66142052a7ef5d38aa58e2f4c83d1ef4bab60#acc66142052a7ef5d38aa58e2f4c83d1ef4bab60"
 dependencies = [
  "gw-common",
  "gw-config",
@@ -1901,7 +1901,7 @@ dependencies = [
 [[package]]
 name = "gw-types"
 version = "0.1.0"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=ffc4f42c947ccc49bf404f97ff862e2944ff5588#ffc4f42c947ccc49bf404f97ff862e2944ff5588"
+source = "git+https://github.com/nervosnetwork/godwoken.git?rev=acc66142052a7ef5d38aa58e2f4c83d1ef4bab60#acc66142052a7ef5d38aa58e2f4c83d1ef4bab60"
 dependencies = [
  "cfg-if 0.1.10",
  "ckb-fixed-hash",
@@ -1914,7 +1914,7 @@ dependencies = [
 [[package]]
 name = "gw-utils"
 version = "0.1.0"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=ffc4f42c947ccc49bf404f97ff862e2944ff5588#ffc4f42c947ccc49bf404f97ff862e2944ff5588"
+source = "git+https://github.com/nervosnetwork/godwoken.git?rev=acc66142052a7ef5d38aa58e2f4c83d1ef4bab60#acc66142052a7ef5d38aa58e2f4c83d1ef4bab60"
 dependencies = [
  "anyhow",
  "ckb-crypto",
@@ -1930,7 +1930,7 @@ dependencies = [
 [[package]]
 name = "gw-version"
 version = "0.8.0"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=ffc4f42c947ccc49bf404f97ff862e2944ff5588#ffc4f42c947ccc49bf404f97ff862e2944ff5588"
+source = "git+https://github.com/nervosnetwork/godwoken.git?rev=acc66142052a7ef5d38aa58e2f4c83d1ef4bab60#acc66142052a7ef5d38aa58e2f4c83d1ef4bab60"
 dependencies = [
  "anyhow",
 ]
@@ -1938,7 +1938,7 @@ dependencies = [
 [[package]]
 name = "gw-web3-indexer"
 version = "0.1.0"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=ffc4f42c947ccc49bf404f97ff862e2944ff5588#ffc4f42c947ccc49bf404f97ff862e2944ff5588"
+source = "git+https://github.com/nervosnetwork/godwoken.git?rev=acc66142052a7ef5d38aa58e2f4c83d1ef4bab60#acc66142052a7ef5d38aa58e2f4c83d1ef4bab60"
 dependencies = [
  "anyhow",
  "ckb-hash",
diff --git a/c/Makefile b/c/Makefile
index 4c3e68cb..b15a35a4 100644
--- a/c/Makefile
+++ b/c/Makefile
@@ -10,7 +10,7 @@ VALIDATOR_FLAGS := -DGW_VALIDATOR
 LDFLAGS := -Wl,-static -fdata-sections -ffunction-sections -Wl,--gc-sections
 MOLC := moleculec
 MOLC_VERSION := 0.7.2
-PROTOCOL_VERSION := ffc4f42c947ccc49bf404f97ff862e2944ff5588
+PROTOCOL_VERSION := acc66142052a7ef5d38aa58e2f4c83d1ef4bab60
 PROTOCOL_SCHEMA_URL := https://raw.githubusercontent.com/nervosnetwork/godwoken/${PROTOCOL_VERSION}/crates/types/schemas
 
 # docker pull nervos/ckb-riscv-gnu-toolchain:gnu-bionic-20191012
diff --git a/c/godwoken.mol b/c/godwoken.mol
index 49fc56c5..6c7b5bee 100644
--- a/c/godwoken.mol
+++ b/c/godwoken.mol
@@ -178,11 +178,11 @@ table DepositLockArgs {
 // --- custodian lock ---
 // a rollup_type_hash exists before this args, to make args friendly to prefix search
 table CustodianLockArgs {
+    deposit_block_hash: Byte32,
+    deposit_block_number: Uint64,
     // used for revert this cell to deposit request cell
     // after finalize, this lock is meaningless
     deposit_lock_args: DepositLockArgs,
-    deposit_block_hash: Byte32,
-    deposit_block_number: Uint64,
 }
 
 struct UnlockCustodianViaRevertWitness {
diff --git a/contracts/Cargo.lock b/contracts/Cargo.lock
index 7a812dfd..aa4ce8e4 100644
--- a/contracts/Cargo.lock
+++ b/contracts/Cargo.lock
@@ -280,7 +280,7 @@ dependencies = [
 [[package]]
 name = "gw-common"
 version = "0.1.0"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=ffc4f42c947ccc49bf404f97ff862e2944ff5588#ffc4f42c947ccc49bf404f97ff862e2944ff5588"
+source = "git+https://github.com/nervosnetwork/godwoken.git?rev=acc66142052a7ef5d38aa58e2f4c83d1ef4bab60#acc66142052a7ef5d38aa58e2f4c83d1ef4bab60"
 dependencies = [
  "cfg-if 0.1.10",
  "gw-hash",
@@ -292,7 +292,7 @@ dependencies = [
 [[package]]
 name = "gw-hash"
 version = "0.1.0"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=ffc4f42c947ccc49bf404f97ff862e2944ff5588#ffc4f42c947ccc49bf404f97ff862e2944ff5588"
+source = "git+https://github.com/nervosnetwork/godwoken.git?rev=acc66142052a7ef5d38aa58e2f4c83d1ef4bab60#acc66142052a7ef5d38aa58e2f4c83d1ef4bab60"
 dependencies = [
  "blake2b-ref",
 ]
@@ -308,7 +308,7 @@ dependencies = [
 [[package]]
 name = "gw-types"
 version = "0.1.0"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=ffc4f42c947ccc49bf404f97ff862e2944ff5588#ffc4f42c947ccc49bf404f97ff862e2944ff5588"
+source = "git+https://github.com/nervosnetwork/godwoken.git?rev=acc66142052a7ef5d38aa58e2f4c83d1ef4bab60#acc66142052a7ef5d38aa58e2f4c83d1ef4bab60"
 dependencies = [
  "cfg-if 0.1.10",
  "gw-hash",
diff --git a/contracts/gw-utils/Cargo.toml b/contracts/gw-utils/Cargo.toml
index acf8a833..5b3742a1 100644
--- a/contracts/gw-utils/Cargo.toml
+++ b/contracts/gw-utils/Cargo.toml
@@ -8,5 +8,5 @@ edition = "2018"
 
 [dependencies]
 ckb-std = "0.9.0"
-gw-types = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "ffc4f42c947ccc49bf404f97ff862e2944ff5588", default-features = false }
-gw-common = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "ffc4f42c947ccc49bf404f97ff862e2944ff5588", default-features = false }
+gw-types = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "acc66142052a7ef5d38aa58e2f4c83d1ef4bab60", default-features = false }
+gw-common = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "acc66142052a7ef5d38aa58e2f4c83d1ef4bab60", default-features = false }
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
index 525989de..a40d8013 100644
--- a/tests/Cargo.toml
+++ b/tests/Cargo.toml
@@ -7,17 +7,17 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-gw-types = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "ffc4f42c947ccc49bf404f97ff862e2944ff5588" }
-gw-common = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "ffc4f42c947ccc49bf404f97ff862e2944ff5588" }
-gw-config = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "ffc4f42c947ccc49bf404f97ff862e2944ff5588" }
-gw-db = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "ffc4f42c947ccc49bf404f97ff862e2944ff5588" }
-gw-store = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "ffc4f42c947ccc49bf404f97ff862e2944ff5588" }
-gw-traits = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "ffc4f42c947ccc49bf404f97ff862e2944ff5588" }
-gw-generator = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "ffc4f42c947ccc49bf404f97ff862e2944ff5588" }
-gw-chain = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "ffc4f42c947ccc49bf404f97ff862e2944ff5588" }
-gw-mem-pool = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "ffc4f42c947ccc49bf404f97ff862e2944ff5588" }
-gw-block-producer = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "ffc4f42c947ccc49bf404f97ff862e2944ff5588" }
-gw-ckb-hardfork = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "ffc4f42c947ccc49bf404f97ff862e2944ff5588" }
+gw-types = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "acc66142052a7ef5d38aa58e2f4c83d1ef4bab60" }
+gw-common = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "acc66142052a7ef5d38aa58e2f4c83d1ef4bab60" }
+gw-config = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "acc66142052a7ef5d38aa58e2f4c83d1ef4bab60" }
+gw-db = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "acc66142052a7ef5d38aa58e2f4c83d1ef4bab60" }
+gw-store = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "acc66142052a7ef5d38aa58e2f4c83d1ef4bab60" }
+gw-traits = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "acc66142052a7ef5d38aa58e2f4c83d1ef4bab60" }
+gw-generator = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "acc66142052a7ef5d38aa58e2f4c83d1ef4bab60" }
+gw-chain = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "acc66142052a7ef5d38aa58e2f4c83d1ef4bab60" }
+gw-mem-pool = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "acc66142052a7ef5d38aa58e2f4c83d1ef4bab60" }
+gw-block-producer = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "acc66142052a7ef5d38aa58e2f4c83d1ef4bab60" }
+gw-ckb-hardfork = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "acc66142052a7ef5d38aa58e2f4c83d1ef4bab60" }
 parking_lot = "0.11"
 anyhow = "1.0"
 blake2b-rs = "0.2"