Merge pull request #112 from zeroqn/chore-types-godwoken-mol-custodia…

…n-lock-args chore!: optimize CustodianLockArgs
godwokenrises · Mar 7, 2022 · 81676d9 · 81676d9
2 parents 24abc95 + 670af4d
commit 81676d9
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 42 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
diff --git 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
@@ -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"