diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 7a51fa2c1..b6d0e1fb6 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -8,9 +8,9 @@ on:
 
 env:
   # Use docker.io for Docker Hub if empty
-  REGISTRY: ${{ github.ref_type != 'tag' && 'ghcr.io/' || '' }}
+  REGISTRY: 'ghcr.io/'
   # github.repository as <account>/<repo>
-  IMAGE_NAME: godwoken-prebuilds
+  IMAGE_NAME: godwoken
 
 
 jobs:
@@ -66,8 +66,8 @@ jobs:
         uses: docker/login-action@v2
         with:
           registry: ${{ env.REGISTRY }}
-          username: ${{ github.ref_type != 'tag' && github.repository_owner || secrets.DOCKERHUB_USERNAME }}
-          password: ${{ github.ref_type != 'tag' && secrets.GITHUB_TOKEN || secrets.DOCKERHUB_TOKEN }}
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Prepare components
         id: prepare
@@ -156,7 +156,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v4
         with:
-          images: ${{ env.REGISTRY }}${{ startsWith(github.ref, 'refs/tags') && github.repository_owner == 'godwokenrises' && 'nervos' || github.repository_owner }}/${{ env.IMAGE_NAME }}
+          images: ${{ env.REGISTRY }}${{ github.repository_owner }}/${{ env.IMAGE_NAME }}
           # dynamically set date as a suffix
           tags: |
             type=ref,event=tag
@@ -165,9 +165,9 @@ jobs:
           labels: |
             maintainer=Godwoken Core Dev
             org.opencontainers.image.authors=Godwoken Core Dev
-            source.component.godwoken=https://github.com/godwokenrises/godwoken/tree/${{steps.prepare.outputs.GODWOKEN_REF }}
-            source.component.gwos=https://github.com/godwokenrises/godwoken/tree/${{steps.prepare.outputs.GODWOKEN_REF }}/gwos
-            source.component.gwos-evm=https://github.com/godwokenrises/godwoken/tree/${{steps.prepare.outputs.GODWOKEN_REF }}/gwos-evm
+            source.component.godwoken=https://github.com/godwokenrises/godwoken/tree/${{steps.prepare.outputs.godwoken-sha1 }}
+            source.component.gwos=https://github.com/godwokenrises/godwoken/tree/${{steps.prepare.outputs.godwoken-sha1 }}/gwos
+            source.component.gwos-evm=https://github.com/godwokenrises/godwoken/tree/${{steps.prepare.outputs.godwoken-sha1 }}/gwos-evm
             source.component.ckb-production-scripts=https://github.com/nervosnetwork/ckb-production-scripts/tree/${{steps.prepare.outputs.OMNI_LOCK_REF }}
             ref.component.godwoken=${{ steps.prepare.outputs.GODWOKEN_REF }}
             ref.component.godwoken-sha1=${{ steps.prepare.outputs.godwoken-sha1 }}
@@ -181,19 +181,6 @@ jobs:
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image to ${{ env.REGISTRY }}${{ github.repository_owner }}/${{ env.IMAGE_NAME }}
-        if: ${{ github.ref_type != 'tag' }}
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: docker/Dockerfile
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-      # Build and push Docker image with Buildx (don't push on PR)
-      # only for new tag
-      - name: Build and push Docker image to https://hub.docker.com/r/nervos/godwoken-prebuilds
-        if: ${{ github.repository_owner == 'godwokenrises' && startsWith(github.ref, 'refs/tags') }}
         uses: docker/build-push-action@v3
         with:
           context: .
diff --git a/.github/workflows/gwos-evm-ci.yml b/.github/workflows/gwos-evm-ci.yml
index 434edbbe8..9c9d6df99 100644
--- a/.github/workflows/gwos-evm-ci.yml
+++ b/.github/workflows/gwos-evm-ci.yml
@@ -35,7 +35,7 @@ jobs:
       run: rustup component add rustfmt && rustup component add clippy
     - name: Install moleculec
       run: |
-        export MOLC_VERSION=$(cat deps/godwoken-scripts/c/Makefile | egrep "MOLC_VERSION :=" | awk '{print $3}')
+        export MOLC_VERSION=$(cat ../gwos/c/Makefile | egrep "MOLC_VERSION :=" | awk '{print $3}')
         test "$(moleculec --version)" = "Moleculec $MOLC_VERSION" \
         || CARGO_TARGET_DIR=target/ cargo install moleculec --version $MOLC_VERSION
     - name: Install ckb-cli from nervos/godwoken-prebuilds:latest
diff --git a/.github/workflows/scripts.yml b/.github/workflows/scripts.yml
index 789ca9526..2b74377b6 100644
--- a/.github/workflows/scripts.yml
+++ b/.github/workflows/scripts.yml
@@ -71,7 +71,6 @@ jobs:
     - name: Copy contracts from prebuild docker images
       run: devtools/fetch-binaries.sh
     - name: Test C Uint256
-      working-directory: gwos
-      run: cargo test
+      run: cargo test -p c-uint256-tests
     - name: Script tests
       run: cargo test --features scripts script_tests
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8ffa87d4..15289d72b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com).
 
 ## [Unreleased]
 
+## [v1.8.0-rc2] - 2022-12-19
+
+A major change in this release is re-interpreting the meaning of the `xxx_timepoint` field to `finalized timestamp`. 
+Thus, we can use the CKB transaction's `since` field to determine the l1 timestamp and to unlock l1 cells without reference to the Rollup cell. It also simplifies the finality determination of withdrawal cells.
+
+- feat: change timepoint interpretation [#897](https://github.com/godwokenrises/godwoken/pull/897)
+- refactor: rename structure fields [#912](https://github.com/godwokenrises/godwoken/pull/912)
+
+We also adjust the documentation:
+
+- doc: update Finality Mechanism Changes [#913](https://github.com/godwokenrises/godwoken/pull/913/files)
+
+Other changes:
+
+- refactor: move gw-types and gw-common to gwos folder [#905](https://github.com/godwokenrises/godwoken/pull/905)
+- feat: support CKB built-in indexer #907 [#907](https://github.com/godwokenrises/godwoken/pull/907)
+
 ## [v1.8.0-rc1] - 2022-12-09
 
 In this version, an upgrading of on-chain scripts is included:
@@ -16,6 +33,10 @@ We also introduce a change to activate the new behavior.
 
 - feat: determine global state version according to fork height[#858](https://github.com/godwokenrises/godwoken/pull/858)
 
+Experimental gas-less feature [(discussion link)](https://github.com/godwokenrises/godwoken/discussions/860):
+
+- feat: (optionally) support gasless transactions [#869](https://github.com/godwokenrises/godwoken/pull/869)
+
 Other changes:
 
 - perf: optional SMT trie feature and migrate command [#859](https://github.com/godwokenrises/godwoken/pull/859)
diff --git a/Cargo.lock b/Cargo.lock
index 3a9bf5d75..507325764 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -134,15 +134,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "autocfg"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78"
-dependencies = [
- "autocfg 1.1.0",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -195,6 +186,15 @@ dependencies = [
  "shlex",
 ]
 
+[[package]]
+name = "bit-set"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
+dependencies = [
+ "bit-vec",
+]
+
 [[package]]
 name = "bit-vec"
 version = "0.6.3"
@@ -310,6 +310,16 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "c-uint256-tests"
+version = "1.8.0-rc2"
+dependencies = [
+ "cc",
+ "cty",
+ "primitive-types",
+ "proptest",
+]
+
 [[package]]
 name = "cache-padded"
 version = "1.2.0"
@@ -379,9 +389,9 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.22"
+version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
+checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
 dependencies = [
  "iana-time-zone",
  "js-sys",
@@ -831,15 +841,6 @@ dependencies = [
  "os_str_bytes",
 ]
 
-[[package]]
-name = "cloudabi"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-dependencies = [
- "bitflags",
-]
-
 [[package]]
 name = "codespan-reporting"
 version = "0.11.1"
@@ -984,7 +985,7 @@ version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "cfg-if 1.0.0",
  "crossbeam-utils",
  "memoffset",
@@ -1396,12 +1397,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
 
-[[package]]
-name = "fuchsia-cprng"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-
 [[package]]
 name = "funty"
 version = "2.0.0"
@@ -1576,7 +1571,7 @@ dependencies = [
 
 [[package]]
 name = "godwoken-bin"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "anyhow",
  "ckb-types",
@@ -1591,6 +1586,7 @@ dependencies = [
  "gw-generator",
  "gw-jsonrpc-types",
  "gw-metrics",
+ "gw-smt",
  "gw-store",
  "gw-telemetry",
  "gw-types",
@@ -1609,7 +1605,7 @@ dependencies = [
 
 [[package]]
 name = "gw-benches"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "anyhow",
  "criterion",
@@ -1618,6 +1614,7 @@ dependencies = [
  "gw-db",
  "gw-generator",
  "gw-mem-pool",
+ "gw-smt",
  "gw-store",
  "gw-traits",
  "gw-types",
@@ -1627,7 +1624,7 @@ dependencies = [
 
 [[package]]
 name = "gw-block-producer"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "anyhow",
  "async-channel",
@@ -1653,6 +1650,7 @@ dependencies = [
  "gw-polyjuice-sender-recover",
  "gw-rpc-client",
  "gw-rpc-server",
+ "gw-smt",
  "gw-store",
  "gw-telemetry",
  "gw-types",
@@ -1672,7 +1670,7 @@ dependencies = [
 
 [[package]]
 name = "gw-chain"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "anyhow",
  "ckb-fixed-hash",
@@ -1684,6 +1682,7 @@ dependencies = [
  "gw-jsonrpc-types",
  "gw-mem-pool",
  "gw-metrics",
+ "gw-smt",
  "gw-store",
  "gw-telemetry",
  "gw-traits",
@@ -1700,7 +1699,7 @@ dependencies = [
 
 [[package]]
 name = "gw-challenge"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -1715,6 +1714,7 @@ dependencies = [
  "gw-generator",
  "gw-jsonrpc-types",
  "gw-rpc-client",
+ "gw-smt",
  "gw-store",
  "gw-traits",
  "gw-types",
@@ -1730,19 +1730,18 @@ dependencies = [
 
 [[package]]
 name = "gw-common"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "cfg-if 0.1.10",
  "gw-hash",
  "gw-types",
  "merkle-cbt",
- "sparse-merkle-tree",
  "thiserror",
 ]
 
 [[package]]
 name = "gw-config"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "ckb-fixed-hash",
  "gw-jsonrpc-types",
@@ -1753,7 +1752,7 @@ dependencies = [
 
 [[package]]
 name = "gw-db"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "anyhow",
  "ckb-rocksdb",
@@ -1766,7 +1765,7 @@ dependencies = [
 
 [[package]]
 name = "gw-dynamic-config"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -1781,7 +1780,7 @@ dependencies = [
 
 [[package]]
 name = "gw-generator"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -1791,6 +1790,7 @@ dependencies = [
  "ethabi",
  "gw-common",
  "gw-config",
+ "gw-smt",
  "gw-store",
  "gw-traits",
  "gw-types",
@@ -1799,7 +1799,7 @@ dependencies = [
  "lazy_static",
  "log",
  "rlp",
- "secp256k1 0.20.3",
+ "secp256k1 0.24.1",
  "sha3",
  "substrate-bn",
  "tempfile",
@@ -1810,14 +1810,14 @@ dependencies = [
 
 [[package]]
 name = "gw-hash"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "blake2b-ref 0.3.1",
 ]
 
 [[package]]
 name = "gw-jsonrpc-types"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "anyhow",
  "ckb-fixed-hash",
@@ -1830,7 +1830,7 @@ dependencies = [
 
 [[package]]
 name = "gw-mem-pool"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -1860,7 +1860,7 @@ dependencies = [
 
 [[package]]
 name = "gw-metrics"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "arc-swap",
  "gw-common",
@@ -1877,7 +1877,7 @@ dependencies = [
 
 [[package]]
 name = "gw-p2p-network"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -1895,7 +1895,7 @@ dependencies = [
 
 [[package]]
 name = "gw-polyjuice-sender-recover"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "anyhow",
  "gw-common",
@@ -1911,7 +1911,7 @@ dependencies = [
 
 [[package]]
 name = "gw-replay-chain"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "anyhow",
  "async-jsonrpc-client",
@@ -1943,7 +1943,7 @@ dependencies = [
 
 [[package]]
 name = "gw-rpc-client"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -1975,7 +1975,7 @@ dependencies = [
 
 [[package]]
 name = "gw-rpc-server"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -1998,6 +1998,7 @@ dependencies = [
  "gw-metrics",
  "gw-polyjuice-sender-recover",
  "gw-rpc-client",
+ "gw-smt",
  "gw-store",
  "gw-telemetry",
  "gw-traits",
@@ -2019,15 +2020,26 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "gw-smt"
+version = "1.8.0-rc2"
+dependencies = [
+ "cfg-if 0.1.10",
+ "gw-hash",
+ "gw-types",
+ "sparse-merkle-tree",
+]
+
 [[package]]
 name = "gw-store"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "anyhow",
  "arc-swap",
  "gw-common",
  "gw-config",
  "gw-db",
+ "gw-smt",
  "gw-traits",
  "gw-types",
  "im",
@@ -2036,7 +2048,7 @@ dependencies = [
 
 [[package]]
 name = "gw-telemetry"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "chrono",
  "faster-hex 0.6.1",
@@ -2057,7 +2069,7 @@ dependencies = [
 
 [[package]]
 name = "gw-tests"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "anyhow",
  "async-jsonrpc-client",
@@ -2085,6 +2097,7 @@ dependencies = [
  "gw-polyjuice-sender-recover",
  "gw-rpc-client",
  "gw-rpc-server",
+ "gw-smt",
  "gw-store",
  "gw-traits",
  "gw-types",
@@ -2093,7 +2106,7 @@ dependencies = [
  "jsonrpc-v2",
  "lazy_static",
  "rand 0.8.5",
- "secp256k1 0.21.3",
+ "secp256k1 0.24.1",
  "serde",
  "serde_json",
  "sha3",
@@ -2104,7 +2117,7 @@ dependencies = [
 
 [[package]]
 name = "gw-tools"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "anyhow",
  "bech32",
@@ -2154,7 +2167,7 @@ dependencies = [
 
 [[package]]
 name = "gw-traits"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "anyhow",
  "gw-common",
@@ -2164,10 +2177,11 @@ dependencies = [
 
 [[package]]
 name = "gw-tx-filter"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "gw-common",
  "gw-config",
+ "gw-smt",
  "gw-traits",
  "gw-types",
  "hex",
@@ -2177,7 +2191,7 @@ dependencies = [
 
 [[package]]
 name = "gw-types"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "cfg-if 0.1.10",
  "ckb-fixed-hash",
@@ -2185,12 +2199,11 @@ dependencies = [
  "gw-hash",
  "molecule",
  "primitive-types",
- "sparse-merkle-tree",
 ]
 
 [[package]]
 name = "gw-utils"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "anyhow",
  "ckb-crypto",
@@ -2201,12 +2214,13 @@ dependencies = [
  "gw-config",
  "gw-jsonrpc-types",
  "gw-rpc-client",
+ "gw-smt",
  "gw-store",
  "gw-types",
  "hex-literal",
  "log",
  "rand 0.8.5",
- "secp256k1 0.21.3",
+ "secp256k1 0.24.1",
  "sha3",
  "tokio",
  "zstd",
@@ -2214,7 +2228,7 @@ dependencies = [
 
 [[package]]
 name = "gw-version"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 dependencies = [
  "anyhow",
 ]
@@ -2498,7 +2512,7 @@ version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "hashbrown",
 ]
 
@@ -2695,7 +2709,7 @@ version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "scopeguard",
 ]
 
@@ -2762,7 +2776,7 @@ version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
 ]
 
 [[package]]
@@ -2893,7 +2907,7 @@ version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "num-traits",
 ]
 
@@ -2903,7 +2917,7 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
 ]
 
 [[package]]
@@ -3051,7 +3065,7 @@ version = "0.9.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "cc",
  "libc",
  "openssl-src",
@@ -3484,6 +3498,26 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "proptest"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e0d9cc07f18492d879586c92b485def06bc850da3118075cd45d50e9c95b0e5"
+dependencies = [
+ "bit-set",
+ "bitflags",
+ "byteorder",
+ "lazy_static",
+ "num-traits",
+ "quick-error 2.0.1",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+ "rand_xorshift",
+ "regex-syntax",
+ "rusty-fork",
+ "tempfile",
+]
+
 [[package]]
 name = "prost"
 version = "0.9.0"
@@ -3537,6 +3571,18 @@ dependencies = [
  "prost",
 ]
 
+[[package]]
+name = "quick-error"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+
+[[package]]
+name = "quick-error"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
+
 [[package]]
 name = "quick-xml"
 version = "0.22.0"
@@ -3561,25 +3607,6 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
 
-[[package]]
-name = "rand"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
-dependencies = [
- "autocfg 0.1.8",
- "libc",
- "rand_chacha 0.1.1",
- "rand_core 0.4.2",
- "rand_hc 0.1.0",
- "rand_isaac",
- "rand_jitter",
- "rand_os",
- "rand_pcg 0.1.2",
- "rand_xorshift",
- "winapi",
-]
-
 [[package]]
 name = "rand"
 version = "0.7.3"
@@ -3590,8 +3617,8 @@ dependencies = [
  "libc",
  "rand_chacha 0.2.2",
  "rand_core 0.5.1",
- "rand_hc 0.2.0",
- "rand_pcg 0.2.1",
+ "rand_hc",
+ "rand_pcg",
 ]
 
 [[package]]
@@ -3605,16 +3632,6 @@ dependencies = [
  "rand_core 0.6.3",
 ]
 
-[[package]]
-name = "rand_chacha"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
-dependencies = [
- "autocfg 0.1.8",
- "rand_core 0.3.1",
-]
-
 [[package]]
 name = "rand_chacha"
 version = "0.2.2"
@@ -3635,21 +3652,6 @@ dependencies = [
  "rand_core 0.6.3",
 ]
 
-[[package]]
-name = "rand_core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-dependencies = [
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-
 [[package]]
 name = "rand_core"
 version = "0.5.1"
@@ -3668,15 +3670,6 @@ dependencies = [
  "getrandom 0.2.7",
 ]
 
-[[package]]
-name = "rand_hc"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
-dependencies = [
- "rand_core 0.3.1",
-]
-
 [[package]]
 name = "rand_hc"
 version = "0.2.0"
@@ -3686,50 +3679,6 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
-[[package]]
-name = "rand_isaac"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_jitter"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
-dependencies = [
- "libc",
- "rand_core 0.4.2",
- "winapi",
-]
-
-[[package]]
-name = "rand_os"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
-dependencies = [
- "cloudabi",
- "fuchsia-cprng",
- "libc",
- "rand_core 0.4.2",
- "rdrand",
- "winapi",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
-dependencies = [
- "autocfg 0.1.8",
- "rand_core 0.4.2",
-]
-
 [[package]]
 name = "rand_pcg"
 version = "0.2.1"
@@ -3741,11 +3690,11 @@ dependencies = [
 
 [[package]]
 name = "rand_xorshift"
-version = "0.1.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
+checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
 dependencies = [
- "rand_core 0.3.1",
+ "rand_core 0.6.3",
 ]
 
 [[package]]
@@ -3763,7 +3712,7 @@ version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "crossbeam-deque",
  "either",
  "rayon-core",
@@ -3781,15 +3730,6 @@ dependencies = [
  "num_cpus",
 ]
 
-[[package]]
-name = "rdrand"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-dependencies = [
- "rand_core 0.3.1",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.2.16"
@@ -3942,6 +3882,18 @@ dependencies = [
  "semver",
 ]
 
+[[package]]
+name = "rusty-fork"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
+dependencies = [
+ "fnv",
+ "quick-error 1.2.3",
+ "tempfile",
+ "wait-timeout",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.11"
@@ -4008,22 +3960,13 @@ dependencies = [
  "secp256k1-sys 0.4.2",
 ]
 
-[[package]]
-name = "secp256k1"
-version = "0.21.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c42e6f1735c5f00f51e43e28d6634141f2bcad10931b2609ddd74a86d751260"
-dependencies = [
- "rand 0.6.5",
- "secp256k1-sys 0.4.2",
-]
-
 [[package]]
 name = "secp256k1"
 version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff55dc09d460954e9ef2fa8a7ced735a964be9981fd50e870b2b3b0705e14964"
 dependencies = [
+ "rand 0.8.5",
  "secp256k1-sys 0.6.1",
 ]
 
@@ -4194,7 +4137,7 @@ version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
 ]
 
 [[package]]
@@ -4612,7 +4555,7 @@ version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "bytes",
  "libc",
  "memchr",
@@ -4925,6 +4868,15 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
+[[package]]
+name = "wait-timeout"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "walkdir"
 version = "2.3.2"
diff --git a/Cargo.toml b/Cargo.toml
index d5f6c066f..03be23bee 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,15 +1,16 @@
 [workspace]
 members = [
+  "gwos/crates/types",
+  "gwos/crates/common",
+  "gwos/crates/c-uint256-tests",
   "crates/challenge",
   "crates/chain",
   "crates/config",
-  "crates/common",
   "crates/mem-pool",
   "crates/generator",
   "crates/traits",
   "crates/db",
   "crates/store",
-  "crates/types",
   "crates/block-producer",
   "crates/jsonrpc-types",
   "crates/rpc-server",
@@ -30,7 +31,8 @@ members = [
 ]
 
 exclude = [
- "gwos-evm/polyjuice-tests"
+ "gwos-evm/polyjuice-tests",
+ "gwos/contracts",
 ]
 
 [profile.release]
diff --git a/crates/benches/Cargo.toml b/crates/benches/Cargo.toml
index 7003ed885..1324b9568 100644
--- a/crates/benches/Cargo.toml
+++ b/crates/benches/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-benches"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 description = "Godwoken benchmarks."
@@ -14,10 +14,11 @@ anyhow = "1.0.66"
 criterion = { version = "0.3", features = ["html_reports"] }
 pprof = { version = "0.6", features = ["flamegraph", "criterion"] }
 gw-store = { path = "../store" }
-gw-common = { path = "../common" }
+gw-common = { path = "../../gwos/crates/common" }
+gw-smt = { path = "../smt" }
 gw-mem-pool = { path = "../mem-pool" }
 gw-generator = { path = "../generator" }
-gw-types = { path = "../types" }
+gw-types = { path = "../../gwos/crates/types" }
 gw-traits = { path = "../traits" }
 gw-db = { path = "../db" }
 gw-config = { path = "../config" }
diff --git a/crates/benches/benches/benchmarks/fee_queue.rs b/crates/benches/benches/benchmarks/fee_queue.rs
index a97e15984..34b6bc527 100644
--- a/crates/benches/benches/benchmarks/fee_queue.rs
+++ b/crates/benches/benches/benchmarks/fee_queue.rs
@@ -1,5 +1,5 @@
 use criterion::{criterion_group, Bencher, Criterion};
-use gw_common::{h256_ext::H256Ext, state::State, H256};
+use gw_common::state::State;
 use gw_config::GenesisConfig;
 use gw_generator::genesis::init_genesis;
 use gw_mem_pool::fee::{
@@ -13,6 +13,7 @@ use gw_store::{
 };
 use gw_types::{
     bytes::Bytes,
+    h256::*,
     packed::{AllowedTypeHash, L2Transaction, RawL2Transaction, RollupConfig},
     prelude::{Builder, Entity, Pack, PackVec, Unpack},
 };
@@ -165,10 +166,7 @@ fn setup_genesis(store: &Store) {
         meta_contract_validator_type_hash: [0u8; 32].into(),
         eth_registry_validator_type_hash: [1u8; 32].into(),
         rollup_config: rollup_config.into(),
-        rollup_type_hash: {
-            let h: [u8; 32] = rollup_type_hash.into();
-            h.into()
-        },
+        rollup_type_hash: rollup_type_hash.into(),
         secp_data_dep: Default::default(),
     };
     init_genesis(store, &genesis_config, &[0u8; 32], Bytes::default()).unwrap();
diff --git a/crates/benches/benches/benchmarks/smt.rs b/crates/benches/benches/benchmarks/smt.rs
index 3c3c77c9f..be21ebdf6 100644
--- a/crates/benches/benches/benchmarks/smt.rs
+++ b/crates/benches/benches/benchmarks/smt.rs
@@ -7,7 +7,6 @@ use gw_common::{
     builtins::{CKB_SUDT_ACCOUNT_ID, ETH_REGISTRY_ACCOUNT_ID},
     registry_address::RegistryAddress,
     state::State,
-    H256,
 };
 use gw_config::{BackendConfig, BackendForkConfig, GenesisConfig, StoreConfig};
 use gw_db::{schema::COLUMNS, RocksDB};
@@ -33,6 +32,7 @@ use gw_traits::{ChainView, CodeStore};
 use gw_types::{
     bytes::Bytes,
     core::{AllowedEoaType, ScriptHashType, Status},
+    h256::*,
     packed::{
         AccountMerkleState, AllowedTypeHash, BlockInfo, BlockMerkleState, Fee, GlobalState,
         L2Block, RawL2Block, RawL2Transaction, RollupConfig, SUDTArgs, SUDTTransfer, Script,
@@ -147,7 +147,7 @@ impl BenchExecutionEnvironment {
 
         let rollup_context = RollupContext {
             rollup_config: genesis_config.rollup_config.clone().into(),
-            rollup_script_hash: ROLLUP_TYPE_HASH.into(),
+            rollup_script_hash: ROLLUP_TYPE_HASH,
             ..Default::default()
         };
 
@@ -175,8 +175,7 @@ impl BenchExecutionEnvironment {
 
         let account_lock_manage = {
             let mut manage = AccountLockManage::default();
-            manage
-                .register_lock_algorithm(ALWAYS_SUCCESS_LOCK_HASH.into(), Arc::new(AlwaysSuccess));
+            manage.register_lock_algorithm(ALWAYS_SUCCESS_LOCK_HASH, Arc::new(AlwaysSuccess));
             manage
         };
 
@@ -220,7 +219,7 @@ impl BenchExecutionEnvironment {
             .collect();
 
         let address_offset = state
-            .get_account_id_by_script_hash(&block_producer_script.hash().into())
+            .get_account_id_by_script_hash(&block_producer_script.hash())
             .unwrap()
             .unwrap(); // start from block producer
         let start_account_id = address_offset + 1;
@@ -297,7 +296,7 @@ impl BenchExecutionEnvironment {
     ) -> Vec<Account> {
         let build_account = |idx: u32| -> Account {
             let (account_script, addr) = Account::build_script(idx);
-            let account_script_hash: H256 = account_script.hash().into();
+            let account_script_hash: H256 = account_script.hash();
             let account_id = state.create_account(account_script_hash).unwrap();
             state.insert_script(account_script_hash, account_script);
             state
@@ -316,7 +315,7 @@ impl BenchExecutionEnvironment {
     fn init_genesis(store: &Store, config: &GenesisConfig, accounts: u32) {
         if store.has_genesis().unwrap() {
             let chain_id = store.get_chain_id().unwrap();
-            if chain_id == ROLLUP_TYPE_HASH.into() {
+            if chain_id == ROLLUP_TYPE_HASH {
                 return;
             } else {
                 panic!("store genesis already initialized");
@@ -324,7 +323,7 @@ impl BenchExecutionEnvironment {
         }
 
         let db = store.begin_transaction();
-        db.setup_chain_id(ROLLUP_TYPE_HASH.into()).unwrap();
+        db.setup_chain_id(ROLLUP_TYPE_HASH).unwrap();
         let (db, genesis_state) = build_genesis_from_store(db, config, Default::default()).unwrap();
 
         let smt = db
@@ -340,8 +339,7 @@ impl BenchExecutionEnvironment {
         state.finalise().unwrap();
 
         let (genesis, global_state) = {
-            let prev_state_checkpoint: [u8; 32] =
-                state.calculate_state_checkpoint().unwrap().into();
+            let prev_state_checkpoint: [u8; 32] = state.calculate_state_checkpoint().unwrap();
             let submit_txs = SubmitTransactions::new_builder()
                 .prev_state_checkpoint(prev_state_checkpoint.pack())
                 .build();
diff --git a/crates/benches/benches/benchmarks/sudt.rs b/crates/benches/benches/benchmarks/sudt.rs
index ddf887cea..f07d797b8 100644
--- a/crates/benches/benches/benchmarks/sudt.rs
+++ b/crates/benches/benches/benchmarks/sudt.rs
@@ -1,14 +1,14 @@
 use anyhow::{bail, Result};
 use criterion::*;
 use gw_common::{
-    builtins::ETH_REGISTRY_ACCOUNT_ID, registry_address::RegistryAddress, smt::SMT, state::State,
-    H256,
+    builtins::ETH_REGISTRY_ACCOUNT_ID, registry_address::RegistryAddress, state::State,
 };
 use gw_config::{BackendConfig, BackendForkConfig};
 use gw_generator::{
     account_lock_manage::AccountLockManage, backend_manage::BackendManage, error::TransactionError,
     traits::StateExt, Generator,
 };
+use gw_smt::smt::{SMT, SMTH256};
 use gw_store::{
     smt::smt_store::SMTStateStore,
     snapshot::StoreSnapshot,
@@ -23,6 +23,7 @@ use gw_traits::{ChainView, CodeStore};
 use gw_types::{
     bytes::Bytes,
     core::{AllowedEoaType, ScriptHashType},
+    h256::*,
     offchain::RunResult,
     packed::{AllowedTypeHash, BlockInfo, Fee},
     packed::{RawL2Transaction, RollupConfig, SUDTArgs, SUDTTransfer, Script},
@@ -75,7 +76,7 @@ impl ChainView for DummyChainStore {
 }
 
 fn new_state(store: StoreSnapshot) -> MemStateDB {
-    let smt = SMT::new(H256::zero(), SMTStateStore::new(MemStore::new(store)));
+    let smt = SMT::new(SMTH256::zero(), SMTStateStore::new(MemStore::new(store)));
     let inner = MemStateTree::new(smt, 0);
     MemStateDB::new(inner)
 }
@@ -105,7 +106,7 @@ fn run_contract_get_result<S: State + CodeStore + JournalDB>(
     let account_lock_manage = AccountLockManage::default();
     let rollup_ctx = RollupContext {
         rollup_config: rollup_config.clone(),
-        rollup_script_hash: [42u8; 32].into(),
+        rollup_script_hash: [42u8; 32],
         ..Default::default()
     };
     let generator = Generator::new(
@@ -222,7 +223,7 @@ pub fn bench(c: &mut Criterion) {
                         .build()
                 };
                 let block_producer = RegistryAddress::new(ETH_REGISTRY_ACCOUNT_ID, vec![3u8; 20]);
-                let block_producer_script_hash = block_producer_script.hash().into();
+                let block_producer_script_hash = block_producer_script.hash();
                 tree.mapping_registry_address_to_script_hash(
                     block_producer.clone(),
                     block_producer_script_hash,
diff --git a/crates/block-producer/Cargo.toml b/crates/block-producer/Cargo.toml
index b9f7986f7..ba224e38e 100644
--- a/crates/block-producer/Cargo.toml
+++ b/crates/block-producer/Cargo.toml
@@ -1,15 +1,16 @@
 [package]
 name = "gw-block-producer"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 authors = ["Nervos Network"]
 edition = "2021"
 
 [dependencies]
 gw-challenge = { path = "../challenge" }
-gw-common = { path = "../common" }
+gw-common = { path = "../../gwos/crates/common" }
+gw-smt = { path = "../smt" }
 gw-config = { path = "../config" }
 gw-chain = { path = "../chain" }
-gw-types = { path = "../types" }
+gw-types = { path = "../../gwos/crates/types" }
 gw-db = { path = "../db" }
 gw-store = { path = "../store" }
 gw-generator = { path = "../generator" }
diff --git a/crates/block-producer/src/block_producer.rs b/crates/block-producer/src/block_producer.rs
index 48a91f8f6..e48cddb3a 100644
--- a/crates/block-producer/src/block_producer.rs
+++ b/crates/block-producer/src/block_producer.rs
@@ -12,7 +12,6 @@ use crate::{
 use anyhow::{bail, ensure, Context, Result};
 use ckb_chain_spec::consensus::MAX_BLOCK_BYTES;
 use gw_chain::chain::Chain;
-use gw_common::H256;
 use gw_config::BlockProducerConfig;
 use gw_generator::Generator;
 use gw_jsonrpc_types::test_mode::TestModePayload;
@@ -21,11 +20,12 @@ use gw_mem_pool::{
     pool::{MemPool, OutputParam},
 };
 use gw_rpc_client::{contract::ContractsCellDepManager, rpc_client::RPCClient};
+use gw_smt::smt::SMTH256;
 use gw_store::Store;
-use gw_types::core::Timepoint;
 use gw_types::offchain::{global_state_from_slice, CompatibleFinalizedTimepoint};
 use gw_types::{
     bytes::Bytes,
+    h256::*,
     offchain::{DepositInfo, InputCellInfo},
     packed::{
         CellDep, CellInput, CellOutput, GlobalState, L2Block, RollupAction, RollupActionUnion,
@@ -34,9 +34,9 @@ use gw_types::{
     prelude::*,
 };
 use gw_utils::{
-    fee::fill_tx_fee_with_local, genesis_info::CKBGenesisInfo, local_cells::LocalCellsManager,
-    query_rollup_cell, since::Since, transaction_skeleton::TransactionSkeleton, wallet::Wallet,
-    RollupContext,
+    fee::fill_tx_fee_with_local, finalized_timepoint, genesis_info::CKBGenesisInfo,
+    local_cells::LocalCellsManager, query_rollup_cell, since::Since,
+    transaction_skeleton::TransactionSkeleton, wallet::Wallet, RollupContext,
 };
 use std::{collections::HashSet, sync::Arc, time::Instant};
 use tokio::sync::Mutex;
@@ -60,21 +60,15 @@ fn generate_custodian_cells(
     block: &L2Block,
     deposit_cells: &[DepositInfo],
 ) -> Vec<(CellOutput, Bytes)> {
-    let block_hash: H256 = block.hash().into();
-    let block_timepoint = {
-        let block_number = block.raw().number().unpack();
-        if rollup_context
-            .fork_config
-            .use_timestamp_as_timepoint(block_number)
-        {
-            let block_timestamp = block.raw().timestamp().unpack();
-            Timepoint::from_timestamp(block_timestamp)
-        } else {
-            Timepoint::from_block_number(block_number)
-        }
-    };
+    let block_hash: H256 = block.hash();
+    let finalized_timepoint = finalized_timepoint(
+        &rollup_context.rollup_config,
+        &rollup_context.fork_config,
+        block.raw().number().unpack(),
+        block.raw().timestamp().unpack(),
+    );
     let to_custodian = |deposit| -> _ {
-        to_custodian_cell(rollup_context, &block_hash, &block_timepoint, deposit)
+        to_custodian_cell(rollup_context, &block_hash, &finalized_timepoint, deposit)
             .expect("sanitized deposit")
     };
 
@@ -179,11 +173,11 @@ impl BlockProducer {
         let reverted_block_root: H256 = {
             let db = self.store.begin_transaction();
             let smt = db.reverted_block_smt()?;
-            smt.root().to_owned()
+            (*smt.root()).into()
         };
 
         let param = ProduceBlockParam {
-            stake_cell_owner_lock_hash: self.wallet.lock_script().hash().into(),
+            stake_cell_owner_lock_hash: self.wallet.lock_script().hash(),
             reverted_block_root,
             rollup_config_hash: self.rollup_config_hash,
             block_param,
@@ -265,20 +259,24 @@ impl BlockProducer {
                 let db = self.store.begin_transaction();
                 let block_smt = db.reverted_block_smt()?;
 
-                let local_root: &H256 = block_smt.root();
+                let local_root: H256 = (*block_smt.root()).into();
                 let global_revert_block_root: H256 = global_state.reverted_block_root().unpack();
-                assert_eq!(local_root, &global_revert_block_root);
+                assert_eq!(local_root, global_revert_block_root);
 
                 let keys: Vec<H256> = collected_block_hashes.into_iter().collect();
                 for key in keys.iter() {
                     log::info!("submit revert block {:?}", hex::encode(key.as_slice()));
                 }
-                let proof = block_smt
-                    .merkle_proof(keys.clone())?
-                    .compile(keys.clone())?;
+                let reverted_block_hashes = keys.pack();
+                let proof = {
+                    let smt_keys: Vec<SMTH256> = keys.into_iter().map(Into::into).collect();
+                    block_smt
+                        .merkle_proof(smt_keys.clone())?
+                        .compile(smt_keys)?
+                };
 
                 RollupSubmitBlock::new_builder()
-                    .reverted_block_hashes(keys.pack())
+                    .reverted_block_hashes(reverted_block_hashes)
                     .reverted_block_proof(proof.0.pack())
             } else {
                 RollupSubmitBlock::new_builder()
@@ -380,7 +378,7 @@ impl BlockProducer {
         }
 
         // withdrawal cells
-        let map_withdrawal_extras = withdrawal_extras.into_iter().map(|w| (w.hash().into(), w));
+        let map_withdrawal_extras = withdrawal_extras.into_iter().map(|w| (w.hash(), w));
         if let Some(generated_withdrawal_cells) = crate::withdrawal::generate(
             rollup_context,
             finalized_custodians,
diff --git a/crates/block-producer/src/block_sync_client.rs b/crates/block-producer/src/block_sync_client.rs
index c77d3b4f8..945d5e6c9 100644
--- a/crates/block-producer/src/block_sync_client.rs
+++ b/crates/block-producer/src/block_sync_client.rs
@@ -339,7 +339,7 @@ async fn handle_local_block(
     let store_tx = &client.store.begin_transaction();
     let store_block_hash = store_tx.get_block_hash_by_number(block_number)?;
     if let Some(store_block_hash) = store_block_hash {
-        if store_block_hash != block_hash.into() {
+        if store_block_hash != block_hash {
             log::info!("revert to {}", block_number - 1);
             revert(client, store_tx, block_number - 1).await?;
             store_tx.commit()?;
diff --git a/crates/block-producer/src/chain_updater.rs b/crates/block-producer/src/chain_updater.rs
index 050a3dd99..11b1181a6 100644
--- a/crates/block-producer/src/chain_updater.rs
+++ b/crates/block-producer/src/chain_updater.rs
@@ -71,7 +71,7 @@ impl ChainUpdater {
         let tx = self
             .rpc_client
             .ckb
-            .get_transaction(tx_hash.0.into())
+            .get_transaction(tx_hash.0)
             .await?
             .context("get transaction")?;
 
@@ -219,7 +219,7 @@ impl ChainUpdater {
             let tx = self
                 .rpc_client
                 .ckb
-                .get_transaction(tx_hash.0.into())
+                .get_transaction(tx_hash.0)
                 .await?
                 .ok_or_else(|| QueryL1TxError::new(&tx_hash, anyhow!("cannot locate tx")))?;
             let cell_output = tx
diff --git a/crates/block-producer/src/challenger.rs b/crates/block-producer/src/challenger.rs
index c529ea663..25ea4edaa 100644
--- a/crates/block-producer/src/challenger.rs
+++ b/crates/block-producer/src/challenger.rs
@@ -16,7 +16,6 @@ use gw_challenge::offchain::verify_tx::{verify_tx, TxWithContext};
 use gw_challenge::offchain::{mock_cancel_challenge_tx, OffChainMockContext};
 use gw_challenge::revert::Revert;
 use gw_challenge::types::{RevertContext, VerifyContext};
-use gw_common::H256;
 use gw_config::{BlockProducerConfig, DebugConfig};
 use gw_generator::types::vm::ChallengeContext;
 use gw_jsonrpc_types::test_mode::TestModePayload;
@@ -24,6 +23,7 @@ use gw_rpc_client::contract::ContractsCellDepManager;
 use gw_rpc_client::rpc_client::RPCClient;
 use gw_types::bytes::Bytes;
 use gw_types::core::{ChallengeTargetType, Status};
+use gw_types::h256::*;
 use gw_types::offchain::{global_state_from_slice, CellInfo, InputCellInfo, TxStatus};
 use gw_types::packed::{
     CellDep, CellInput, CellOutput, ChallengeLockArgs, ChallengeLockArgsReader, ChallengeTarget,
diff --git a/crates/block-producer/src/cleaner.rs b/crates/block-producer/src/cleaner.rs
index 9e170f521..9953eacce 100644
--- a/crates/block-producer/src/cleaner.rs
+++ b/crates/block-producer/src/cleaner.rs
@@ -6,9 +6,9 @@ use gw_utils::{fee::fill_tx_fee, wallet::Wallet};
 use anyhow::{anyhow, Result};
 use ckb_types::prelude::{Builder, Entity};
 use gw_challenge::cancel_challenge::RecoverAccountsContext;
-use gw_common::H256;
 use gw_rpc_client::rpc_client::RPCClient;
 use gw_types::core::Status;
+use gw_types::h256::*;
 use gw_types::offchain::{global_state_from_slice, CellInfo, InputCellInfo, TxStatus};
 use gw_types::packed::{CellDep, CellInput, Transaction, WitnessArgs};
 use gw_types::prelude::Unpack;
diff --git a/crates/block-producer/src/custodian.rs b/crates/block-producer/src/custodian.rs
index 45ca48d98..aa40123e4 100644
--- a/crates/block-producer/src/custodian.rs
+++ b/crates/block-producer/src/custodian.rs
@@ -140,7 +140,7 @@ async fn query_mergeable_ckb_custodians(
             };
             if !compatible_finalized_timepoint.is_finalized(&Timepoint::from_full_value(
                 custodian_lock_args_reader
-                    .deposit_block_timepoint()
+                    .deposit_finalized_timepoint()
                     .unpack(),
             )) {
                 continue;
diff --git a/crates/block-producer/src/debugger.rs b/crates/block-producer/src/debugger.rs
index d28aea06e..1395388a8 100644
--- a/crates/block-producer/src/debugger.rs
+++ b/crates/block-producer/src/debugger.rs
@@ -5,12 +5,12 @@ use std::{
 
 use anyhow::{anyhow, Result};
 use ckb_types::prelude::Entity;
-use gw_common::H256;
 use gw_jsonrpc_types::{
     ckb_jsonrpc_types,
     debugger::{ReprMockCellDep, ReprMockInfo, ReprMockInput, ReprMockTransaction},
 };
 use gw_rpc_client::rpc_client::RPCClient;
+use gw_types::h256::*;
 use gw_types::{
     core::DepType,
     offchain::TxStatus,
@@ -134,7 +134,7 @@ pub async fn build_mock_transaction(
         };
         inputs.push(mock_input);
         if let Some(input_block_hash) = input_block_hash {
-            header_deps_hashes.push(input_block_hash.into());
+            header_deps_hashes.push(input_block_hash);
         }
     }
 
@@ -191,7 +191,7 @@ pub async fn build_mock_transaction(
         };
         cell_deps.push(mock_cell_dep);
         if let Some(dep_cell_block_hash) = dep_cell_block_hash {
-            header_deps_hashes.push(dep_cell_block_hash.into());
+            header_deps_hashes.push(dep_cell_block_hash);
         }
     }
 
diff --git a/crates/block-producer/src/produce_block.rs b/crates/block-producer/src/produce_block.rs
index 8eeb94aaf..68a949d8f 100644
--- a/crates/block-producer/src/produce_block.rs
+++ b/crates/block-producer/src/produce_block.rs
@@ -4,24 +4,25 @@
 
 use anyhow::{anyhow, Result};
 use gw_common::{
-    h256_ext::H256Ext,
     merkle_utils::{calculate_ckb_merkle_root, calculate_state_checkpoint, ckb_merkle_leaf_hash},
-    smt::Blake2bHasher,
-    sparse_merkle_tree::CompiledMerkleProof,
     state::State,
-    H256,
 };
 use gw_generator::Generator;
 use gw_mem_pool::mem_block::MemBlock;
+use gw_smt::{
+    smt::{Blake2bHasher, SMTH256},
+    smt_h256_ext::SMTH256Ext,
+    sparse_merkle_tree::CompiledMerkleProof,
+};
 use gw_store::{
     state::{history::history_state::RWConfig, BlockStateDB},
     traits::chain_store::ChainStore,
     transaction::StoreTransaction,
     Store,
 };
-use gw_types::core::Timepoint;
 use gw_types::{
     core::Status,
+    h256::*,
     offchain::{BlockParam, DepositInfo, FinalizedCustodianCapacity},
     packed::{
         AccountMerkleState, BlockMerkleState, GlobalState, L2Block, RawL2Block, SubmitTransactions,
@@ -29,6 +30,7 @@ use gw_types::{
     },
     prelude::*,
 };
+use gw_utils::global_state_finalized_timepoint;
 use tracing::instrument;
 
 #[derive(Clone)]
@@ -80,17 +82,16 @@ pub fn produce_block(
     } = param;
 
     let rollup_context = generator.rollup_context();
-    let parent_block_hash: H256 = parent_block.hash().into();
+    let parent_block_hash: H256 = parent_block.hash();
 
     // assemble block
     let submit_txs = {
         let tx_witness_root = calculate_ckb_merkle_root(
             txs.iter()
                 .enumerate()
-                .map(|(id, tx)| ckb_merkle_leaf_hash(id as u32, &tx.witness_hash().into()))
+                .map(|(id, tx)| ckb_merkle_leaf_hash(id as u32, &tx.witness_hash()))
                 .collect(),
-        )
-        .map_err(|err| anyhow!("merkle root error: {:?}", err))?;
+        );
         let tx_count = txs.len() as u32;
         SubmitTransactions::new_builder()
             .tx_witness_root(tx_witness_root.pack())
@@ -103,12 +104,9 @@ pub fn produce_block(
             withdrawals
                 .iter()
                 .enumerate()
-                .map(|(id, request)| {
-                    ckb_merkle_leaf_hash(id as u32, &request.witness_hash().into())
-                })
+                .map(|(id, request)| ckb_merkle_leaf_hash(id as u32, &request.witness_hash()))
                 .collect(),
-        )
-        .map_err(|err| anyhow!("merkle root error: {:?}", err))?;
+        );
         let withdrawal_count = withdrawals.len() as u32;
         SubmitWithdrawals::new_builder()
             .withdrawal_witness_root(withdrawal_witness_root.pack())
@@ -140,9 +138,9 @@ pub fn produce_block(
         .build();
     let block_smt = db.block_smt()?;
     let block_proof = block_smt
-        .merkle_proof(vec![H256::from_u64(number)])
+        .merkle_proof(vec![SMTH256::from_u64(number)])
         .map_err(|err| anyhow!("merkle proof error: {:?}", err))?
-        .compile(vec![H256::from_u64(number)])?;
+        .compile(vec![SMTH256::from_u64(number)])?;
     let packed_kv_state = kv_state.pack();
     let withdrawal_requests = withdrawals.iter().map(|w| w.request());
     let block = L2Block::new_builder()
@@ -164,22 +162,12 @@ pub fn produce_block(
             .build()
     };
 
-    let last_finalized_timepoint = if rollup_context
-        .fork_config
-        .use_timestamp_as_timepoint(number)
-    {
-        let finality_time_in_ms = rollup_context.rollup_config.finality_time_in_ms();
-        Timepoint::from_timestamp(
-            block
-                .raw()
-                .timestamp()
-                .unpack()
-                .saturating_sub(finality_time_in_ms),
-        )
-    } else {
-        let finality_as_blocks = rollup_context.rollup_config.finality_blocks().unpack();
-        Timepoint::from_block_number(number.saturating_sub(finality_as_blocks))
-    };
+    let last_finalized_timepoint = global_state_finalized_timepoint(
+        &rollup_context.rollup_config,
+        &rollup_context.fork_config,
+        block.raw().number().unpack(),
+        block.raw().timestamp().unpack(),
+    );
     let global_state = GlobalState::new_builder()
         .account(post_merkle_state)
         .block(post_block)
@@ -233,7 +221,7 @@ pub fn generate_produce_block_param(
     } else {
         let state_smt = db.state_smt()?;
 
-        let keys: Vec<H256> = kv_state.iter().map(|(k, _v)| *k).collect();
+        let keys: Vec<SMTH256> = kv_state.iter().map(|(k, _v)| (*k).into()).collect();
         state_smt
             .merkle_proof(keys.clone())
             .map_err(|err| anyhow!("merkle proof error: {:?}", err))?
@@ -289,16 +277,22 @@ pub fn generate_produce_block_param(
         let expected_kv_state_root: H256 = prev_merkle_state.merkle_root().unpack();
         let smt = db.state_smt()?;
         assert_eq!(
-            smt.root(),
-            &expected_kv_state_root,
+            H256::from(*smt.root()),
+            expected_kv_state_root,
             "check smt root consistent"
         );
 
         if !kv_state_proof.is_empty() {
             log::debug!("[output mem-block] check merkle proof");
             // check state merkle proof before output
-            let prev_kv_state_root = CompiledMerkleProof(kv_state_proof.clone())
-                .compute_root::<Blake2bHasher>(kv_state.clone())?;
+            let prev_kv_state_root: H256 = CompiledMerkleProof(kv_state_proof.clone())
+                .compute_root::<Blake2bHasher>(
+                    kv_state
+                        .iter()
+                        .map(|(k, v)| ((*k).into(), (*v).into()))
+                        .collect(),
+                )?
+                .into();
             let expected_kv_state_root: H256 = prev_merkle_state.merkle_root().unpack();
             assert_eq!(
                 expected_kv_state_root, prev_kv_state_root,
diff --git a/crates/block-producer/src/psc.rs b/crates/block-producer/src/psc.rs
index de224fff7..db0c34a50 100644
--- a/crates/block-producer/src/psc.rs
+++ b/crates/block-producer/src/psc.rs
@@ -4,7 +4,6 @@ use std::{collections::HashSet, fmt::Display, sync::Arc, time::Duration};
 
 use anyhow::{bail, ensure, Context, Result};
 use gw_chain::chain::Chain;
-use gw_common::H256;
 use gw_config::PscConfig;
 use gw_mem_pool::{block_sync_server::BlockSyncServerState, pool::MemPool};
 use gw_rpc_client::{
@@ -14,6 +13,7 @@ use gw_rpc_client::{
 use gw_store::{snapshot::StoreSnapshot, traits::chain_store::ChainStore, Store};
 use gw_telemetry::traits::{OpenTelemetrySpanExt, TraceContextExt};
 use gw_types::{
+    h256::*,
     offchain::{CellStatus, DepositInfo, TxStatus},
     packed::{
         self, Confirmed, GlobalState, LocalBlock, NumberHash, OutPoint, Revert, Script, ScriptVec,
@@ -399,7 +399,7 @@ async fn produce_local_block(ctx: &PSCContext) -> Result<()> {
     };
 
     let number: u64 = block.raw().number().unpack();
-    let block_hash: H256 = block.hash().into();
+    let block_hash: H256 = block.hash();
 
     let block_txs = block.transactions().len();
     let block_withdrawals = block.withdrawals().len();
@@ -638,10 +638,7 @@ async fn poll_tx_confirmed(rpc_client: &RPCClient, tx: &Transaction) -> Result<(
     log::info!("waiting for tx 0x{}", hex::encode(tx.hash()));
     let mut last_sent = Instant::now();
     loop {
-        let status = rpc_client
-            .ckb
-            .get_transaction_status(tx.hash().into())
-            .await?;
+        let status = rpc_client.ckb.get_transaction_status(tx.hash()).await?;
         let should_resend = match status {
             Some(TxStatus::Committed) => break,
             Some(TxStatus::Rejected) => true,
@@ -668,7 +665,7 @@ async fn poll_tx_confirmed(rpc_client: &RPCClient, tx: &Transaction) -> Result<(
     // Wait for indexer syncing the L1 block.
     let block_number = rpc_client
         .ckb
-        .get_transaction_block_number(tx.hash().into())
+        .get_transaction_block_number(tx.hash())
         .await?
         .context("get tx block hash")?;
     loop {
@@ -771,7 +768,7 @@ async fn check_cell(rpc_client: &RPCClient, out_point: &OutPoint) -> Result<()>
                     .any(|i| i.previous_output().eq(out_point))
                 {
                     bail!(DeadCellError {
-                        consumed_by_tx: Some(tx.hash().into()),
+                        consumed_by_tx: Some(tx.hash()),
                     });
                 }
             }
@@ -804,7 +801,7 @@ async fn send_transaction_or_check_inputs(
                 // This can happen if the tx is confirmed right before it is
                 // resent and its inputs is checked.
                 if let Some(dead) = e.downcast_ref::<DeadCellError>() {
-                    if dead.consumed_by_tx == Some(tx.hash().into()) {
+                    if dead.consumed_by_tx == Some(tx.hash()) {
                         return Ok(());
                     }
                 }
@@ -911,7 +908,7 @@ fn publish_local_block(
     let withdrawals = {
         let reqs = block.as_reader().withdrawals();
         let extra_reqs = reqs.iter().map(|w| {
-            let h = w.hash().into();
+            let h = w.hash();
             snap.get_withdrawal(&h)?
                 .with_context(|| format!("block {} withdrawal {} not found", b, h.pack()))
         });
diff --git a/crates/block-producer/src/replay_block.rs b/crates/block-producer/src/replay_block.rs
index c8a147d87..a8395b377 100644
--- a/crates/block-producer/src/replay_block.rs
+++ b/crates/block-producer/src/replay_block.rs
@@ -3,7 +3,6 @@ use ckb_types::bytes::Bytes;
 use ckb_types::prelude::{Builder, Entity};
 use gw_common::registry_address::RegistryAddress;
 use gw_common::state::State;
-use gw_common::H256;
 use gw_generator::traits::StateExt;
 use gw_generator::Generator;
 use gw_store::chain_view::ChainView;
@@ -11,6 +10,7 @@ use gw_store::state::traits::JournalDB;
 use gw_store::state::MemStateDB;
 use gw_store::traits::chain_store::ChainStore;
 use gw_store::Store;
+use gw_types::h256::*;
 use gw_types::packed::{BlockInfo, DepositRequest, L2Block, RawL2Block, WithdrawalRequestExtra};
 use gw_types::prelude::Unpack;
 
diff --git a/crates/block-producer/src/runner.rs b/crates/block-producer/src/runner.rs
index 984e9be21..71920d7af 100644
--- a/crates/block-producer/src/runner.rs
+++ b/crates/block-producer/src/runner.rs
@@ -13,7 +13,7 @@ use anyhow::{anyhow, bail, Context, Result};
 use futures::future::OptionFuture;
 use gw_chain::chain::Chain;
 use gw_challenge::offchain::{OffChainMockContext, OffChainMockContextBuildArgs};
-use gw_common::{blake2b::new_blake2b, registry_address::RegistryAddress, H256};
+use gw_common::{blake2b::new_blake2b, registry_address::RegistryAddress};
 use gw_config::{BlockProducerConfig, Config, NodeMode};
 use gw_db::migrate::{init_migration_factory, open_or_create_db};
 use gw_dynamic_config::manager::DynamicConfigManager;
@@ -43,6 +43,7 @@ use gw_store::Store;
 use gw_types::{
     bytes::Bytes,
     core::AllowedEoaType,
+    h256::*,
     packed::{Byte32, CellDep, NumberHash, RollupConfig, Script},
     prelude::*,
 };
@@ -202,7 +203,7 @@ impl ChainTask {
             }
 
             // update tip
-            Ok(Some((new_block_number, block.header().hash().into())))
+            Ok(Some((new_block_number, block.header().hash())))
         } else {
             log::debug!(
                 "Not found layer1 block #{} sleep {}s then retry",
@@ -272,16 +273,17 @@ impl BaseInitComponents {
         let rollup_config: RollupConfig = config.genesis.rollup_config.clone().into();
         let rollup_context = RollupContext {
             rollup_config: rollup_config.clone(),
-            rollup_script_hash: {
-                let rollup_script_hash: [u8; 32] = config.genesis.rollup_type_hash.clone().into();
-                rollup_script_hash.into()
-            },
+            rollup_script_hash: config.genesis.rollup_type_hash.clone().into(),
             fork_config: config.fork.clone(),
         };
         let rollup_type_script: Script = config.chain.rollup_type_script.clone().into();
         let rpc_client = {
-            let indexer_client = CKBIndexerClient::with_url(&config.rpc_client.indexer_url)?;
             let ckb_client = CKBClient::with_url(&config.rpc_client.ckb_url)?;
+            let indexer_client = if let Some(ref indexer_url) = config.rpc_client.indexer_url {
+                CKBIndexerClient::with_url(indexer_url)?
+            } else {
+                CKBIndexerClient::new(ckb_client.client().clone(), false)
+            };
             let rollup_type_script =
                 ckb_types::packed::Script::new_unchecked(rollup_type_script.as_bytes());
             RPCClient::new(
@@ -338,7 +340,7 @@ impl BaseInitComponents {
             let out_point = config.genesis.secp_data_dep.out_point.clone();
             rpc_client
                 .ckb
-                .get_transaction(out_point.tx_hash.0.into())
+                .get_transaction(out_point.tx_hash.0)
                 .await?
                 .ok_or_else(|| anyhow!("can not found transaction: {:?}", out_point.tx_hash))?
                 .raw()
@@ -365,7 +367,7 @@ impl BaseInitComponents {
         if let Some(res) = gw_dynamic_config::try_reload(dynamic_config_manager.clone()).await {
             log::info!("Reload dynamic config: {:?}", res);
         }
-        let rollup_config_hash: H256 = rollup_config.hash().into();
+        let rollup_config_hash: H256 = rollup_config.hash();
         let generator = {
             let backend_manage = BackendManage::from_config(config.fork.backend_forks.clone())
                 .with_context(|| "config backends")?;
@@ -404,7 +406,7 @@ impl BaseInitComponents {
         };
         let mut builtin_load_data = HashMap::new();
         builtin_load_data.insert(
-            to_hash(secp_data.as_ref()).into(),
+            to_hash(secp_data.as_ref()),
             config.genesis.secp_data_dep.clone().into(),
         );
 
diff --git a/crates/block-producer/src/stake.rs b/crates/block-producer/src/stake.rs
index f2853758c..ea72fbc2a 100644
--- a/crates/block-producer/src/stake.rs
+++ b/crates/block-producer/src/stake.rs
@@ -20,7 +20,7 @@ use gw_types::{
 use gw_utils::local_cells::{
     collect_local_and_indexer_cells, CollectLocalAndIndexerCursor, LocalCellsManager,
 };
-use gw_utils::RollupContext;
+use gw_utils::{finalized_timepoint, RollupContext};
 
 pub struct GeneratedStake {
     pub deps: Vec<CellDep>,
@@ -39,22 +39,16 @@ pub async fn generate(
     local_cells_manager: &LocalCellsManager,
 ) -> Result<GeneratedStake> {
     let owner_lock_hash = lock_script.hash();
-    let stake_block_timepoint = {
-        let block_number: u64 = block.raw().number().unpack();
-        if rollup_context
-            .fork_config
-            .use_timestamp_as_timepoint(block_number)
-        {
-            let block_timestamp: u64 = block.raw().timestamp().unpack();
-            Timepoint::from_timestamp(block_timestamp)
-        } else {
-            Timepoint::from_block_number(block_number)
-        }
-    };
+    let stake_finalized_timepoint = finalized_timepoint(
+        &rollup_context.rollup_config,
+        &rollup_context.fork_config,
+        block.raw().number().unpack(),
+        block.raw().timestamp().unpack(),
+    );
     let lock_args: Bytes = {
         let stake_lock_args = StakeLockArgs::new_builder()
             .owner_lock_hash(owner_lock_hash.pack())
-            .stake_block_timepoint(stake_block_timepoint.full_value().pack())
+            .stake_finalized_timepoint(stake_finalized_timepoint.full_value().pack())
             .build();
         let rollup_type_hash = rollup_context.rollup_script_hash.as_slice().iter();
         rollup_type_hash
@@ -186,7 +180,7 @@ pub async fn query_stake(
             match &compatible_finalize_timepoint_opt {
                 Some(compatible_finalized_timepoint) => {
                     compatible_finalized_timepoint.is_finalized(&Timepoint::from_full_value(
-                        stake_lock_args.stake_block_timepoint().unpack(),
+                        stake_lock_args.stake_finalized_timepoint().unpack(),
                     )) && stake_lock_args.owner_lock_hash().as_slice() == owner_lock_hash
                 }
                 None => stake_lock_args.owner_lock_hash().as_slice() == owner_lock_hash,
diff --git a/crates/block-producer/src/sync_l1.rs b/crates/block-producer/src/sync_l1.rs
index 5fba7c38d..a8aaaaf2c 100644
--- a/crates/block-producer/src/sync_l1.rs
+++ b/crates/block-producer/src/sync_l1.rs
@@ -112,7 +112,6 @@ async fn sync_l1_unknown(
             ..Default::default()
         }));
     let mut last_cursor = None;
-    let tx_hash: [u8; 32] = tx_hash.into();
     let last_confirmed_tx_hash = tx_hash.into();
     let mut seen_last_confirmed = false;
     let mut reverted = false;
@@ -141,9 +140,7 @@ async fn sync_l1_unknown(
             if !reverted {
                 // It's likely that this transaction confirms the next block. In
                 // this case, we just update the last confirmed block.
-                if store_tx.get_block_submit_tx_hash(last_confirmed + 1)
-                    == Some(tx.tx_hash.0.into())
-                {
+                if store_tx.get_block_submit_tx_hash(last_confirmed + 1) == Some(tx.tx_hash.0) {
                     last_confirmed += 1;
                     log::info!("confirmed block {last_confirmed}");
                     continue;
diff --git a/crates/block-producer/src/test_mode_control.rs b/crates/block-producer/src/test_mode_control.rs
index 87eb0d9e4..9134abaed 100644
--- a/crates/block-producer/src/test_mode_control.rs
+++ b/crates/block-producer/src/test_mode_control.rs
@@ -1,15 +1,14 @@
 use anyhow::{anyhow, Result};
 use async_trait::async_trait;
 use ckb_types::prelude::{Builder, Entity};
-use gw_common::h256_ext::H256Ext;
 use gw_common::merkle_utils::{calculate_ckb_merkle_root, ckb_merkle_leaf_hash};
-use gw_common::smt::Blake2bHasher;
-use gw_common::H256;
 use gw_generator::types::vm::ChallengeContext;
 use gw_jsonrpc_types::test_mode::ChallengeType;
 use gw_jsonrpc_types::{godwoken::GlobalState as JsonGlobalState, test_mode::TestModePayload};
 use gw_rpc_client::rpc_client::RPCClient;
 use gw_rpc_server::registry::TestModeRPC;
+use gw_smt::smt::{Blake2bHasher, SMTH256};
+use gw_smt::smt_h256_ext::SMTH256Ext;
 use gw_store::traits::chain_store::ChainStore;
 use gw_store::Store;
 use gw_types::core::{ChallengeTargetType, Status};
@@ -74,131 +73,133 @@ impl TestModeControl {
             (target_index, target_type)
         };
 
-        let bad_block =
-            match target_type {
-                ChallengeType::TxExecution => {
-                    let tx_count: u32 = block.raw().submit_transactions().tx_count().unpack();
-                    if target_index >= tx_count {
-                        return Err(anyhow!("target index out of bound, total {}", tx_count));
-                    }
-
-                    let tx = block.transactions().get_unchecked(target_index as usize);
-                    let bad_tx = {
-                        let raw_tx = tx
-                            .raw()
-                            .as_builder()
-                            .nonce(99999999u32.pack())
-                            .to_id(99999999u32.pack())
-                            .args(Bytes::copy_from_slice("break tx execution".as_bytes()).pack())
-                            .build();
-
-                        tx.as_builder().raw(raw_tx).build()
-                    };
-
-                    let mut txs: Vec<L2Transaction> = block.transactions().into_iter().collect();
-                    *txs.get_mut(target_index as usize).expect("exists") = bad_tx;
-
-                    let tx_witness_root = {
-                        let witnesses = txs.iter().enumerate().map(|(id, tx)| {
-                            ckb_merkle_leaf_hash(id as u32, &tx.witness_hash().into())
-                        });
-                        calculate_ckb_merkle_root(witnesses.collect())?
-                    };
-
-                    let submit_txs = {
-                        let builder = block.raw().submit_transactions().as_builder();
-                        builder.tx_witness_root(tx_witness_root.pack()).build()
-                    };
-
-                    let raw_block = block
-                        .raw()
-                        .as_builder()
-                        .submit_transactions(submit_txs)
-                        .build();
-
-                    block
-                        .as_builder()
-                        .raw(raw_block)
-                        .transactions(txs.pack())
-                        .build()
+        let bad_block = match target_type {
+            ChallengeType::TxExecution => {
+                let tx_count: u32 = block.raw().submit_transactions().tx_count().unpack();
+                if target_index >= tx_count {
+                    return Err(anyhow!("target index out of bound, total {}", tx_count));
                 }
-                ChallengeType::TxSignature => {
-                    let tx_count: u32 = block.raw().submit_transactions().tx_count().unpack();
-                    if target_index >= tx_count {
-                        return Err(anyhow!("target index out of bound, total {}", tx_count));
-                    }
-
-                    let tx = block.transactions().get_unchecked(target_index as usize);
-                    let bad_tx = tx.as_builder().signature(Bytes::default().pack()).build();
-
-                    let mut txs: Vec<L2Transaction> = block.transactions().into_iter().collect();
-                    *txs.get_mut(target_index as usize).expect("exists") = bad_tx;
-
-                    let tx_witness_root = {
-                        let witnesses = txs.iter().enumerate().map(|(id, tx)| {
-                            ckb_merkle_leaf_hash(id as u32, &tx.witness_hash().into())
-                        });
-                        calculate_ckb_merkle_root(witnesses.collect())?
-                    };
-
-                    let submit_txs = {
-                        let builder = block.raw().submit_transactions().as_builder();
-                        builder.tx_witness_root(tx_witness_root.pack()).build()
-                    };
-
-                    let raw_block = block
+
+                let tx = block.transactions().get_unchecked(target_index as usize);
+                let bad_tx = {
+                    let raw_tx = tx
                         .raw()
                         .as_builder()
-                        .submit_transactions(submit_txs)
+                        .nonce(99999999u32.pack())
+                        .to_id(99999999u32.pack())
+                        .args(Bytes::copy_from_slice("break tx execution".as_bytes()).pack())
                         .build();
 
-                    block
-                        .as_builder()
-                        .raw(raw_block)
-                        .transactions(txs.pack())
-                        .build()
+                    tx.as_builder().raw(raw_tx).build()
+                };
+
+                let mut txs: Vec<L2Transaction> = block.transactions().into_iter().collect();
+                *txs.get_mut(target_index as usize).expect("exists") = bad_tx;
+
+                let tx_witness_root = {
+                    let witnesses = txs
+                        .iter()
+                        .enumerate()
+                        .map(|(id, tx)| ckb_merkle_leaf_hash(id as u32, &tx.witness_hash()));
+                    calculate_ckb_merkle_root(witnesses.collect())
+                };
+
+                let submit_txs = {
+                    let builder = block.raw().submit_transactions().as_builder();
+                    builder.tx_witness_root(tx_witness_root.pack()).build()
+                };
+
+                let raw_block = block
+                    .raw()
+                    .as_builder()
+                    .submit_transactions(submit_txs)
+                    .build();
+
+                block
+                    .as_builder()
+                    .raw(raw_block)
+                    .transactions(txs.pack())
+                    .build()
+            }
+            ChallengeType::TxSignature => {
+                let tx_count: u32 = block.raw().submit_transactions().tx_count().unpack();
+                if target_index >= tx_count {
+                    return Err(anyhow!("target index out of bound, total {}", tx_count));
                 }
-                ChallengeType::WithdrawalSignature => {
-                    let count: u32 = block.raw().submit_withdrawals().withdrawal_count().unpack();
-                    if target_index >= count {
-                        return Err(anyhow!("target index out of bound, total {}", count));
-                    }
-
-                    let withdrawal = block.withdrawals().get_unchecked(target_index as usize);
-                    let bad_withdrawal = withdrawal
-                        .as_builder()
-                        .signature(Bytes::default().pack())
-                        .build();
-
-                    let mut withdrawals: Vec<WithdrawalRequest> =
-                        block.withdrawals().into_iter().collect();
-                    *withdrawals.get_mut(target_index as usize).expect("exists") = bad_withdrawal;
-
-                    let withdrawal_witness_root = {
-                        let witnesses = withdrawals.iter().enumerate().map(|(idx, t)| {
-                            ckb_merkle_leaf_hash(idx as u32, &t.witness_hash().into())
-                        });
-                        calculate_ckb_merkle_root(witnesses.collect())?
-                    };
 
-                    let submit_withdrawals = SubmitWithdrawals::new_builder()
-                        .withdrawal_witness_root(withdrawal_witness_root.pack())
-                        .withdrawal_count((withdrawals.len() as u32).pack())
-                        .build();
-
-                    let raw_block = block
-                        .raw()
-                        .as_builder()
-                        .submit_withdrawals(submit_withdrawals)
-                        .build();
-
-                    block
-                        .as_builder()
-                        .raw(raw_block)
-                        .withdrawals(withdrawals.pack())
-                        .build()
+                let tx = block.transactions().get_unchecked(target_index as usize);
+                let bad_tx = tx.as_builder().signature(Bytes::default().pack()).build();
+
+                let mut txs: Vec<L2Transaction> = block.transactions().into_iter().collect();
+                *txs.get_mut(target_index as usize).expect("exists") = bad_tx;
+
+                let tx_witness_root = {
+                    let witnesses = txs
+                        .iter()
+                        .enumerate()
+                        .map(|(id, tx)| ckb_merkle_leaf_hash(id as u32, &tx.witness_hash()));
+                    calculate_ckb_merkle_root(witnesses.collect())
+                };
+
+                let submit_txs = {
+                    let builder = block.raw().submit_transactions().as_builder();
+                    builder.tx_witness_root(tx_witness_root.pack()).build()
+                };
+
+                let raw_block = block
+                    .raw()
+                    .as_builder()
+                    .submit_transactions(submit_txs)
+                    .build();
+
+                block
+                    .as_builder()
+                    .raw(raw_block)
+                    .transactions(txs.pack())
+                    .build()
+            }
+            ChallengeType::WithdrawalSignature => {
+                let count: u32 = block.raw().submit_withdrawals().withdrawal_count().unpack();
+                if target_index >= count {
+                    return Err(anyhow!("target index out of bound, total {}", count));
                 }
-            };
+
+                let withdrawal = block.withdrawals().get_unchecked(target_index as usize);
+                let bad_withdrawal = withdrawal
+                    .as_builder()
+                    .signature(Bytes::default().pack())
+                    .build();
+
+                let mut withdrawals: Vec<WithdrawalRequest> =
+                    block.withdrawals().into_iter().collect();
+                *withdrawals.get_mut(target_index as usize).expect("exists") = bad_withdrawal;
+
+                let withdrawal_witness_root = {
+                    let witnesses = withdrawals
+                        .iter()
+                        .enumerate()
+                        .map(|(idx, t)| ckb_merkle_leaf_hash(idx as u32, &t.witness_hash()));
+                    calculate_ckb_merkle_root(witnesses.collect())
+                };
+
+                let submit_withdrawals = SubmitWithdrawals::new_builder()
+                    .withdrawal_witness_root(withdrawal_witness_root.pack())
+                    .withdrawal_count((withdrawals.len() as u32).pack())
+                    .build();
+
+                let raw_block = block
+                    .raw()
+                    .as_builder()
+                    .submit_withdrawals(submit_withdrawals)
+                    .build();
+
+                block
+                    .as_builder()
+                    .raw(raw_block)
+                    .withdrawals(withdrawals.pack())
+                    .build()
+            }
+        };
 
         let block_number = bad_block.raw().number().unpack();
         let bad_global_state = {
@@ -206,8 +207,8 @@ impl TestModeControl {
 
             let bad_block_proof = db
                 .block_smt()?
-                .merkle_proof(vec![H256::from_u64(block_number)])?
-                .compile(vec![H256::from_u64(block_number)])?;
+                .merkle_proof(vec![SMTH256::from_u64(block_number)])?
+                .compile(vec![SMTH256::from_u64(block_number)])?;
 
             // Generate new block smt for global state
             let bad_block_smt = {
diff --git a/crates/block-producer/src/utils.rs b/crates/block-producer/src/utils.rs
index 90561e641..e5b138b38 100644
--- a/crates/block-producer/src/utils.rs
+++ b/crates/block-producer/src/utils.rs
@@ -1,6 +1,9 @@
 use crate::debugger;
 use gw_rpc_client::rpc_client::RPCClient;
-use gw_types::packed::Transaction;
+use gw_types::core::Timepoint;
+use gw_types::packed::{GlobalState, Transaction};
+use gw_types::prelude::Unpack;
+use gw_utils::since::Since;
 use std::path::Path;
 
 pub async fn dump_transaction<P: AsRef<Path>>(dir: P, rpc_client: &RPCClient, tx: &Transaction) {
@@ -12,3 +15,15 @@ pub async fn dump_transaction<P: AsRef<Path>>(dir: P, rpc_client: &RPCClient, tx
         );
     }
 }
+
+/// Convert global_state.last_finalized_timepoint to the form fo Since.
+pub fn global_state_last_finalized_timepoint_to_since(global_state: &GlobalState) -> u64 {
+    match Timepoint::from_full_value(global_state.last_finalized_timepoint().unpack()) {
+        Timepoint::BlockNumber(_) => 0,
+        Timepoint::Timestamp(time_ms) => {
+            // the since is used to prove finality, so since value can be 1 second later
+            // we adjust the value as `time_ms / 1000 + 1` to prevent the `since` in seconds is less than `time_ms`,
+            Since::new_timestamp_seconds(time_ms / 1000 + 1).as_u64()
+        }
+    }
+}
diff --git a/crates/block-producer/src/withdrawal.rs b/crates/block-producer/src/withdrawal.rs
index ca5b9be1d..4b3f32904 100644
--- a/crates/block-producer/src/withdrawal.rs
+++ b/crates/block-producer/src/withdrawal.rs
@@ -1,9 +1,10 @@
 #![allow(clippy::mutable_key_type)]
 
 use anyhow::{anyhow, Result};
-use gw_common::H256;
 use gw_config::ContractsCellDep;
 use gw_mem_pool::{custodian::sum_withdrawals, withdrawal::Generator};
+use gw_types::core::Timepoint;
+use gw_types::h256::*;
 use gw_types::offchain::CompatibleFinalizedTimepoint;
 use gw_types::packed::RollupConfig;
 use gw_types::{
@@ -17,6 +18,7 @@ use gw_types::{
     },
     prelude::*,
 };
+use gw_utils::withdrawal::parse_lock_args;
 use gw_utils::RollupContext;
 use std::{
     collections::HashMap,
@@ -48,7 +50,7 @@ pub fn generate(
     let total_withdrawal_amount = sum_withdrawals(block.withdrawals().into_iter());
     let mut generator = Generator::new(rollup_context, finalized_custodians.into());
     for req in block.withdrawals().into_iter() {
-        let req_extra = match withdrawal_extras.get(&req.hash().into()) {
+        let req_extra = match withdrawal_extras.get(&req.hash()) {
             Some(req_extra) => req_extra.to_owned(),
             None => WithdrawalRequestExtra::new_builder().request(req).build(),
         };
@@ -190,6 +192,7 @@ pub fn revert(
     }))
 }
 
+#[derive(Debug)]
 pub struct UnlockedWithdrawals {
     pub deps: Vec<CellDep>,
     pub inputs: Vec<InputCellInfo>,
@@ -202,6 +205,7 @@ pub fn unlock_to_owner(
     rollup_config: &RollupConfig,
     contracts_dep: &ContractsCellDep,
     withdrawal_cells: Vec<CellInfo>,
+    global_state_since: u64,
 ) -> Result<Option<UnlockedWithdrawals>> {
     if withdrawal_cells.is_empty() {
         return Ok(None);
@@ -229,6 +233,7 @@ pub fn unlock_to_owner(
         rollup_config.finality_blocks().unpack(),
     );
     let l1_sudt_script_hash = rollup_config.l1_sudt_script_type_hash();
+    let mut if_exist_legacy_withdrawal_cells = false;
     for withdrawal_cell in withdrawal_cells {
         // Double check
         if let Err(err) = gw_rpc_client::withdrawal::verify_unlockable_to_owner(
@@ -240,6 +245,10 @@ pub fn unlock_to_owner(
             continue;
         }
 
+        if !if_exist_legacy_withdrawal_cells {
+            if_exist_legacy_withdrawal_cells = is_legacy_finality_withdrawal_cell(&withdrawal_cell);
+        }
+
         let owner_lock = {
             let args: Bytes = withdrawal_cell.output.lock().args().unpack();
             match gw_utils::withdrawal::parse_lock_args(&args) {
@@ -254,6 +263,7 @@ pub fn unlock_to_owner(
         let withdrawal_input = {
             let input = CellInput::new_builder()
                 .previous_output(withdrawal_cell.out_point.clone())
+                .since(global_state_since.pack())
                 .build();
 
             InputCellInfo {
@@ -282,12 +292,21 @@ pub fn unlock_to_owner(
     let withdrawal_lock_dep = contracts_dep.withdrawal_cell_lock.clone();
     let sudt_type_dep = contracts_dep.l1_sudt_type.clone();
 
-    let mut cell_deps = vec![
-        // rollup_dep and rollup_config_dep will be used by withdrawal_lock_script
-        rollup_dep,
-        rollup_config_dep.into(),
-        withdrawal_lock_dep.into(),
-    ];
+    let mut cell_deps = if if_exist_legacy_withdrawal_cells {
+        // Some withdrawal cells were born at legacy version, withdrawal_lock_script checks finality of withdrawal
+        // cells by comparing with GlobalState.last_finalized_timepoint, so rollup_dep and
+        // rollup_config_dep are required
+        vec![
+            rollup_dep,
+            rollup_config_dep.into(),
+            withdrawal_lock_dep.into(),
+        ]
+    } else {
+        // All withdrawal cells were born at v2, withdrawal_lock_script checks finality of withdrawal
+        // cells by comparing with `since`.
+        vec![withdrawal_lock_dep.into()]
+    };
+
     if unlocked_to_owner_outputs
         .iter()
         .any(|output| output.0.type_().to_opt().is_some())
@@ -303,26 +322,41 @@ pub fn unlock_to_owner(
     }))
 }
 
+fn is_legacy_finality_withdrawal_cell(withdrawal_cell: &CellInfo) -> bool {
+    let withdrawal_lock_args = parse_lock_args(&withdrawal_cell.output.lock().args().raw_data())
+        .expect("parse withdrawal lock args");
+    match Timepoint::from_full_value(
+        withdrawal_lock_args
+            .lock_args
+            .withdrawal_finalized_timepoint()
+            .unpack(),
+    ) {
+        Timepoint::BlockNumber(_) => true,
+        Timepoint::Timestamp(_) => false,
+    }
+}
+
 #[cfg(test)]
 mod test {
     use std::collections::HashMap;
     use std::iter::FromIterator;
 
+    use crate::utils::global_state_last_finalized_timepoint_to_since;
     use crate::withdrawal::generate;
-    use gw_common::{h256_ext::H256Ext, H256};
-    use gw_config::ContractsCellDep;
+    use gw_config::{ContractsCellDep, ForkConfig};
     use gw_types::core::{DepType, ScriptHashType, Timepoint};
+    use gw_types::h256::*;
     use gw_types::offchain::{
         CellInfo, CollectedCustodianCells, CompatibleFinalizedTimepoint, InputCellInfo,
     };
     use gw_types::packed::{
-        CellDep, CellInput, CellOutput, GlobalState, L2Block, OutPoint, RawL2Block,
-        RawWithdrawalRequest, RollupConfig, Script, UnlockWithdrawalViaFinalize,
+        BlockMerkleState, CellDep, CellInput, CellOutput, GlobalState, L2Block, OutPoint,
+        RawL2Block, RawWithdrawalRequest, RollupConfig, Script, UnlockWithdrawalViaFinalize,
         UnlockWithdrawalWitness, UnlockWithdrawalWitnessUnion, WithdrawalLockArgs,
         WithdrawalRequest, WithdrawalRequestExtra, WitnessArgs,
     };
     use gw_types::prelude::{Builder, Entity, Pack, PackVec, Unpack};
-    use gw_utils::RollupContext;
+    use gw_utils::{global_state_finalized_timepoint, RollupContext};
 
     use super::unlock_to_owner;
 
@@ -384,8 +418,7 @@ mod test {
             .request(withdrawal.clone())
             .owner_lock(owner_lock)
             .build();
-        let withdrawal_extras =
-            HashMap::from_iter([(withdrawal.hash().into(), withdrawal_extra.clone())]);
+        let withdrawal_extras = HashMap::from_iter([(withdrawal.hash(), withdrawal_extra.clone())]);
 
         let generated = generate(
             &rollup_context,
@@ -401,7 +434,7 @@ mod test {
         let (expected_output, expected_data) = gw_generator::utils::build_withdrawal_cell_output(
             &rollup_context,
             &withdrawal_extra,
-            &block.hash().into(),
+            &block.hash(),
             &block_timepoint,
             Some(sudt_script.clone()),
         )
@@ -430,7 +463,7 @@ mod test {
     }
 
     #[test]
-    fn test_unlock_to_owner() {
+    fn test_unlock_to_owner_v1() {
         // Output should only change lock to owner lock
         let last_finalized_timepoint = Timepoint::from_block_number(100);
         let global_state = GlobalState::new_builder()
@@ -458,7 +491,7 @@ mod test {
             .build();
 
         let rollup_context = RollupContext {
-            rollup_script_hash: rollup_type.hash().into(),
+            rollup_script_hash: rollup_type.hash(),
             rollup_config: RollupConfig::new_builder()
                 .withdrawal_script_type_hash(H256::from_u32(5).pack())
                 .l1_sudt_script_type_hash(sudt_script.code_hash())
@@ -497,7 +530,7 @@ mod test {
         let withdrawal_without_owner_lock = {
             let lock_args = WithdrawalLockArgs::new_builder()
                 .owner_lock_hash(owner_lock.hash().pack())
-                .withdrawal_block_timepoint(last_finalized_timepoint.full_value().pack())
+                .withdrawal_finalized_timepoint(last_finalized_timepoint.full_value().pack())
                 .build();
 
             let mut args = rollup_type.hash().to_vec();
@@ -513,7 +546,7 @@ mod test {
         let withdrawal_with_owner_lock = {
             let lock_args = WithdrawalLockArgs::new_builder()
                 .owner_lock_hash(owner_lock.hash().pack())
-                .withdrawal_block_timepoint(last_finalized_timepoint.full_value().pack())
+                .withdrawal_finalized_timepoint(last_finalized_timepoint.full_value().pack())
                 .build();
 
             let mut args = rollup_type.hash().to_vec();
@@ -532,6 +565,7 @@ mod test {
             }
         };
 
+        let global_state_since = global_state_last_finalized_timepoint_to_since(&global_state);
         let unlocked = unlock_to_owner(
             rollup_cell.clone(),
             &rollup_context.rollup_config,
@@ -540,6 +574,7 @@ mod test {
                 withdrawal_without_owner_lock,
                 withdrawal_with_owner_lock.clone(),
             ],
+            global_state_since,
         )
         .expect("unlock")
         .expect("some unlocked");
@@ -615,4 +650,238 @@ mod test {
             CellDep::from(contracts_dep.l1_sudt_type).as_slice(),
         );
     }
+
+    #[test]
+    fn test_unlock_to_owner_finality() {
+        const FINALITY_BLOCKS: u64 = 10;
+        const UPGRADE_GLOBAL_STATE_VERSION_TO_V2: u64 = 100;
+        const BLOCK_TIMESTAMP: u64 = 1670000000000;
+
+        let cases = vec![
+            CaseParam {
+                // v1 withdrawal, v1 global state, not finalized
+                id: 0,
+                finality_blocks: FINALITY_BLOCKS,
+                upgrade_global_state_version_to_v2: UPGRADE_GLOBAL_STATE_VERSION_TO_V2,
+                block_timestamp: BLOCK_TIMESTAMP,
+                block_number: UPGRADE_GLOBAL_STATE_VERSION_TO_V2 - 1,
+                withdrawal_finalized_timepoint: Timepoint::BlockNumber(
+                    UPGRADE_GLOBAL_STATE_VERSION_TO_V2 - FINALITY_BLOCKS,
+                ),
+                expected_result: Err(()),
+            },
+            CaseParam {
+                // v1 withdrawal, v1 global state, finalized
+                id: 1,
+                finality_blocks: FINALITY_BLOCKS,
+                upgrade_global_state_version_to_v2: UPGRADE_GLOBAL_STATE_VERSION_TO_V2,
+                block_timestamp: BLOCK_TIMESTAMP,
+                block_number: UPGRADE_GLOBAL_STATE_VERSION_TO_V2 - 1,
+                withdrawal_finalized_timepoint: Timepoint::BlockNumber(
+                    UPGRADE_GLOBAL_STATE_VERSION_TO_V2 - 1 - FINALITY_BLOCKS,
+                ),
+                expected_result: Ok(()),
+            },
+            CaseParam {
+                // v1 withdrawal, v2 global state, not finalized
+                id: 2,
+                finality_blocks: FINALITY_BLOCKS,
+                upgrade_global_state_version_to_v2: UPGRADE_GLOBAL_STATE_VERSION_TO_V2,
+                block_timestamp: BLOCK_TIMESTAMP,
+                block_number: UPGRADE_GLOBAL_STATE_VERSION_TO_V2,
+                withdrawal_finalized_timepoint: Timepoint::BlockNumber(
+                    UPGRADE_GLOBAL_STATE_VERSION_TO_V2 + 1 - FINALITY_BLOCKS,
+                ),
+                expected_result: Err(()),
+            },
+            CaseParam {
+                // v1 withdrawal, v2 global state, finalized
+                id: 3,
+                finality_blocks: FINALITY_BLOCKS,
+                upgrade_global_state_version_to_v2: UPGRADE_GLOBAL_STATE_VERSION_TO_V2,
+                block_timestamp: BLOCK_TIMESTAMP,
+                block_number: UPGRADE_GLOBAL_STATE_VERSION_TO_V2,
+                withdrawal_finalized_timepoint: Timepoint::BlockNumber(
+                    UPGRADE_GLOBAL_STATE_VERSION_TO_V2 - FINALITY_BLOCKS,
+                ),
+                expected_result: Ok(()),
+            },
+            CaseParam {
+                // v2 withdrawal, v2 global state, not finalized
+                id: 4,
+                finality_blocks: FINALITY_BLOCKS,
+                upgrade_global_state_version_to_v2: UPGRADE_GLOBAL_STATE_VERSION_TO_V2,
+                block_timestamp: BLOCK_TIMESTAMP,
+                block_number: UPGRADE_GLOBAL_STATE_VERSION_TO_V2,
+                withdrawal_finalized_timepoint: Timepoint::Timestamp(BLOCK_TIMESTAMP + 1),
+                expected_result: Err(()),
+            },
+            CaseParam {
+                // v2 withdrawal, v2 global state, finalized
+                id: 5,
+                finality_blocks: FINALITY_BLOCKS,
+                upgrade_global_state_version_to_v2: UPGRADE_GLOBAL_STATE_VERSION_TO_V2,
+                block_timestamp: BLOCK_TIMESTAMP,
+                block_number: UPGRADE_GLOBAL_STATE_VERSION_TO_V2,
+                withdrawal_finalized_timepoint: Timepoint::Timestamp(BLOCK_TIMESTAMP),
+                expected_result: Ok(()),
+            },
+        ];
+        for case in cases {
+            run_case(case);
+        }
+
+        #[derive(Debug)]
+        struct CaseParam {
+            #[allow(dead_code)]
+            id: usize,
+            finality_blocks: u64,
+            upgrade_global_state_version_to_v2: u64,
+            block_timestamp: u64,
+            block_number: u64,
+            withdrawal_finalized_timepoint: Timepoint,
+            expected_result: Result<(), ()>,
+        }
+
+        fn run_case(case_param: CaseParam) {
+            println!("case: {:?}", case_param);
+            let CaseParam {
+                id: _,
+                finality_blocks,
+                upgrade_global_state_version_to_v2,
+                block_number,
+                block_timestamp,
+                withdrawal_finalized_timepoint,
+                expected_result,
+            } = case_param;
+
+            let sudt_script = Script::new_builder()
+                .code_hash(H256::from_u32(3).pack())
+                .hash_type(ScriptHashType::Type.into())
+                .args(vec![4u8; 32].pack())
+                .build();
+            let rollup_config = RollupConfig::new_builder()
+                .l1_sudt_script_type_hash(sudt_script.code_hash())
+                .finality_blocks(finality_blocks.pack())
+                .build();
+            let fork_config = ForkConfig {
+                upgrade_global_state_version_to_v2: Some(upgrade_global_state_version_to_v2),
+                ..Default::default()
+            };
+            let global_state = GlobalState::new_builder()
+                .rollup_config_hash(rollup_config.hash().pack())
+                .last_finalized_timepoint(
+                    global_state_finalized_timepoint(
+                        &rollup_config,
+                        &fork_config,
+                        block_number,
+                        block_timestamp,
+                    )
+                    .full_value()
+                    .pack(),
+                )
+                .block(
+                    BlockMerkleState::new_builder()
+                        .count((block_number + 1).pack())
+                        .build(),
+                )
+                .build();
+            let rollup_state_script = Script::new_builder()
+                .code_hash(H256::from_u32(1).pack())
+                .build();
+            let rollup_state_cell = CellInfo {
+                data: global_state.as_bytes(),
+                out_point: OutPoint::new_builder()
+                    .tx_hash(H256::from_u32(2).pack())
+                    .build(),
+                output: CellOutput::new_builder()
+                    .type_(Some(rollup_state_script.clone()).pack())
+                    .build(),
+            };
+            let rollup_context = RollupContext {
+                rollup_script_hash: rollup_state_script.hash(),
+                rollup_config: rollup_config.clone(),
+                fork_config,
+            };
+            let contracts_dep = {
+                ContractsCellDep {
+                    withdrawal_cell_lock: CellDep::new_builder()
+                        .out_point(
+                            OutPoint::new_builder()
+                                .tx_hash(H256::from_u32(6).pack())
+                                .build(),
+                        )
+                        .build()
+                        .into(),
+                    l1_sudt_type: CellDep::new_builder()
+                        .out_point(
+                            OutPoint::new_builder()
+                                .tx_hash(H256::from_u32(7).pack())
+                                .build(),
+                        )
+                        .build()
+                        .into(),
+                    ..Default::default()
+                }
+            };
+
+            // Build owner's lock script and withdrawal cell
+            let owner_lock_script = Script::new_builder()
+                .code_hash(H256::from_u32(8).pack())
+                .hash_type(ScriptHashType::Type.into())
+                .args(vec![9u8; 32].pack())
+                .build();
+            let withdrawal_lock_args = WithdrawalLockArgs::new_builder()
+                .owner_lock_hash(owner_lock_script.hash().pack())
+                .withdrawal_finalized_timepoint(withdrawal_finalized_timepoint.full_value().pack())
+                .build();
+            let withdrawal_cell = CellInfo {
+                output: CellOutput::new_builder()
+                    .type_(Some(sudt_script).pack())
+                    .lock(
+                        Script::new_builder()
+                            .code_hash(rollup_config.withdrawal_script_type_hash())
+                            .hash_type(ScriptHashType::Type.into())
+                            .args({
+                                let mut args = rollup_state_script.hash().to_vec();
+                                args.extend_from_slice(&withdrawal_lock_args.as_bytes());
+                                args.extend_from_slice(
+                                    &(owner_lock_script.as_bytes().len() as u32).to_be_bytes(),
+                                );
+                                args.extend_from_slice(&owner_lock_script.as_bytes());
+                                args.pack()
+                            })
+                            .build(),
+                    )
+                    .build(),
+                data: 100u128.pack().as_bytes(),
+                ..Default::default()
+            };
+
+            let unlocked = unlock_to_owner(
+                rollup_state_cell,
+                &rollup_context.rollup_config,
+                &contracts_dep,
+                vec![withdrawal_cell],
+                global_state_last_finalized_timepoint_to_since(&global_state),
+            )
+            .expect("unlock");
+
+            match expected_result {
+                Ok(()) => {
+                    assert!(unlocked.is_some());
+                    let unlocked = unlocked.unwrap();
+                    for input in unlocked.inputs.iter() {
+                        assert_eq!(
+                            input.input.since().unpack(),
+                            global_state_last_finalized_timepoint_to_since(&global_state),
+                        );
+                    }
+                }
+                Err(()) => {
+                    assert!(unlocked.is_none(), "actual unlocked: {:?}", unlocked);
+                }
+            }
+        }
+    }
 }
diff --git a/crates/block-producer/src/withdrawal_unlocker.rs b/crates/block-producer/src/withdrawal_unlocker.rs
index b551a26c0..4121e41e8 100644
--- a/crates/block-producer/src/withdrawal_unlocker.rs
+++ b/crates/block-producer/src/withdrawal_unlocker.rs
@@ -5,10 +5,10 @@ use std::sync::Arc;
 
 use anyhow::{bail, Result};
 use async_trait::async_trait;
-use gw_common::H256;
 use gw_config::{ContractsCellDep, DebugConfig};
 use gw_rpc_client::contract::ContractsCellDepManager;
 use gw_rpc_client::rpc_client::RPCClient;
+use gw_types::h256::*;
 use gw_types::offchain::{
     global_state_from_slice, CellInfo, CompatibleFinalizedTimepoint, TxStatus,
 };
@@ -26,6 +26,7 @@ use tracing::instrument;
 use crate::types::ChainEvent;
 use crate::utils;
 
+use crate::utils::global_state_last_finalized_timepoint_to_since;
 pub use gw_rpc_client::contract::Guard;
 
 const TRANSACTION_FAILED_TO_RESOLVE_ERROR: &str = "TransactionFailedToResolve";
@@ -197,11 +198,13 @@ pub trait BuildUnlockWithdrawalToOwner {
             unlockable_withdrawals.len()
         );
 
+        let global_state_since = global_state_last_finalized_timepoint_to_since(&global_state);
         let to_unlock = match crate::withdrawal::unlock_to_owner(
             rollup_cell,
             self.rollup_config(),
             &self.contracts_dep(),
             unlockable_withdrawals,
+            global_state_since,
         )? {
             Some(to_unlock) => to_unlock,
             None => return Ok(None),
diff --git a/crates/chain/Cargo.toml b/crates/chain/Cargo.toml
index 17579302b..21b1ff53c 100644
--- a/crates/chain/Cargo.toml
+++ b/crates/chain/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-chain"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 
@@ -8,9 +8,10 @@ edition = "2018"
 
 [dependencies]
 gw-challenge = { path = "../challenge" }
-gw-types = { path = "../types" }
+gw-types = { path = "../../gwos/crates/types" }
 gw-config = { path = "../config" }
-gw-common = { path = "../common" }
+gw-common = { path = "../../gwos/crates/common" }
+gw-smt = { path = "../smt" }
 gw-generator = { path = "../generator" }
 gw-mem-pool = { path = "../mem-pool" }
 gw-store = { path = "../store" }
diff --git a/crates/chain/src/chain.rs b/crates/chain/src/chain.rs
index da7a9edbe..6af11347b 100644
--- a/crates/chain/src/chain.rs
+++ b/crates/chain/src/chain.rs
@@ -2,7 +2,7 @@
 
 use anyhow::{anyhow, bail, ensure, Context, Result};
 use gw_challenge::offchain::{verify_tx::TxWithContext, OffChainMockContext};
-use gw_common::{sparse_merkle_tree, state::State, CKB_SUDT_SCRIPT_ARGS, H256};
+use gw_common::{state::State, CKB_SUDT_SCRIPT_ARGS};
 use gw_config::ChainConfig;
 use gw_generator::{
     generator::{ApplyBlockArgs, ApplyBlockResult},
@@ -22,6 +22,7 @@ use gw_store::{
 use gw_types::{
     bytes::Bytes,
     core::Status,
+    h256::*,
     offchain::global_state_from_slice,
     packed::{
         BlockMerkleState, Byte32, CellInput, CellOutput, ChallengeTarget, ChallengeWitness,
@@ -119,7 +120,8 @@ impl SyncEvent {
 }
 
 /// concrete type aliases
-pub type StateStore = sparse_merkle_tree::default_store::DefaultStore<sparse_merkle_tree::H256>;
+pub type StateStore =
+    gw_smt::sparse_merkle_tree::default_store::DefaultStore<gw_smt::sparse_merkle_tree::H256>;
 
 pub struct LocalState {
     tip: L2Block,
@@ -169,14 +171,14 @@ impl Chain {
             "check generator rollup config"
         );
         let rollup_type_script_hash = rollup_type_script.hash();
-        let chain_id: [u8; 32] = store.get_chain_id()?.into();
+        let chain_id: [u8; 32] = store.get_chain_id()?;
         assert_eq!(
             chain_id, rollup_type_script_hash,
             "Database chain_id must equals to rollup_script_hash"
         );
         let tip = store.get_tip_block()?;
         let last_global_state = store
-            .get_block_post_global_state(&tip.hash().into())?
+            .get_block_post_global_state(&tip.hash())?
             .ok_or_else(|| anyhow!("can't find last global state"))?;
         let local_state = LocalState {
             tip,
@@ -186,10 +188,7 @@ impl Chain {
             .skipped_invalid_block_list
             .iter()
             .cloned()
-            .map(|ckb_h256| {
-                let h: [u8; 32] = ckb_h256.into();
-                h.into()
-            })
+            .map(H256::from)
             .collect();
         Ok(Chain {
             store,
@@ -309,8 +308,7 @@ impl Chain {
                     assert_eq!(local_reverted_block_root, global_reverted_block_root);
 
                     // Check bad block challenge target
-                    let challenge_target =
-                        db.get_bad_block_challenge_target(&l2block.hash().into())?;
+                    let challenge_target = db.get_bad_block_challenge_target(&l2block.hash())?;
                     if self.challenge_target.is_none() && challenge_target.is_some() {
                         self.challenge_target = challenge_target;
                     }
@@ -355,10 +353,7 @@ impl Chain {
                         assert_eq!(local_block_root, global_block_root, "block root fork");
 
                         assert!(self.challenge_target.is_none());
-                        db.set_bad_block_challenge_target(
-                            &l2block.hash().into(),
-                            &challenge_target,
-                        )?;
+                        db.set_bad_block_challenge_target(&l2block.hash(), &challenge_target)?;
                         self.challenge_target = Some(challenge_target.clone());
                         self.local_state.tip = l2block;
 
@@ -481,7 +476,7 @@ impl Chain {
 
                     // Both bad blocks and reverted_blocks should be ascended and matched
                     let local_reverted_blocks =
-                        package_bad_blocks(db, &first_reverted_block.hash().into())?;
+                        package_bad_blocks(db, &first_reverted_block.hash())?;
                     let local_slice: Vec<[u8; 32]> =
                         local_reverted_blocks.iter().map(|b| b.hash()).collect();
                     let submit_slice: Vec<[u8; 32]> =
@@ -493,8 +488,7 @@ impl Chain {
                     db.revert_bad_blocks(&local_reverted_blocks)?;
                     log::debug!("bad blocks reverted");
 
-                    let reverted_block_hashes =
-                        local_reverted_blocks.iter().map(|b| b.hash().into());
+                    let reverted_block_hashes = local_reverted_blocks.iter().map(|b| b.hash());
                     db.set_reverted_block_hashes(
                         &db.get_reverted_block_smt_root()?,
                         prev_reverted_block_root,
@@ -510,7 +504,7 @@ impl Chain {
                     // Check block smt
                     let global_block_smt = global_state.block();
                     let local_block_smt = {
-                        let root: [u8; 32] = db.get_block_smt_root()?.into();
+                        let root: [u8; 32] = db.get_block_smt_root()?;
                         BlockMerkleState::new_builder()
                             .merkle_root(root.pack())
                             .count(first_reverted_block.number())
@@ -534,7 +528,7 @@ impl Chain {
                     log::info!("revert to block {}", local_tip_block_number);
 
                     // Check whether our bad block is reverted
-                    if Some(H256::from(first_reverted_block.hash())) == self.bad_block_hash() {
+                    if Some(first_reverted_block.hash()) == self.bad_block_hash() {
                         self.challenge_target = None;
                         log::info!("clear local bad block");
                     }
@@ -675,9 +669,9 @@ impl Chain {
                         "rewind to last valid tip first"
                     );
 
-                    let local_state_tip_hash: H256 = self.local_state.tip.hash().into();
+                    let local_state_tip_hash: H256 = self.local_state.tip.hash();
                     let last_valid_tip_hash = db.get_last_valid_tip_block_hash()?;
-                    let block_hash: H256 = l2block.hash().into();
+                    let block_hash: H256 = l2block.hash();
                     assert_eq!(
                         local_state_tip_hash, last_valid_tip_hash,
                         "rewind to last valid tip first"
@@ -711,7 +705,7 @@ impl Chain {
                     assert_eq!(local_tip.hash(), local_valid_tip.hash());
 
                     let parent_block_hash: H256 = l2block.raw().parent_block_hash().unpack();
-                    assert_eq!(parent_block_hash, local_tip.hash().into());
+                    assert_eq!(parent_block_hash, local_tip.hash());
 
                     let l2block_number: u64 = l2block.raw().number().unpack();
                     let local_tip_number: u64 = local_tip.raw().number().unpack();
@@ -763,7 +757,7 @@ impl Chain {
                     Ok(())
                 }
                 RevertL1ActionContext::RewindToLastValidTip => {
-                    let local_state_tip_hash: H256 = self.local_state.tip.hash().into();
+                    let local_state_tip_hash: H256 = self.local_state.tip.hash();
                     let last_valid_tip_block_hash = db.get_last_valid_tip_block_hash()?;
 
                     let local_state_global_state = &self.local_state.last_global_state;
@@ -887,7 +881,7 @@ impl Chain {
         // and get reclaimed. Finalized custodians may be merged in bad block submit tx and this
         // will not be reverted.
         let is_bad_block_reverted = has_bad_block_before_update && self.challenge_target.is_none();
-        let tip_block_hash: H256 = self.local_state.tip.hash().into();
+        let tip_block_hash: H256 = self.local_state.tip.hash();
         if let Some(mem_pool) = &self.mem_pool {
             if matches!(self.last_sync_event, SyncEvent::Success)
                 && (is_l1_revert_happend || is_bad_block_reverted)
@@ -912,8 +906,8 @@ impl Chain {
         };
 
         assert_eq!(
-            db.state_smt().unwrap().root(),
-            &expected_account.merkle_root().unpack(),
+            H256::from(*db.state_smt().unwrap().root()).pack(),
+            expected_account.merkle_root(),
             "account root consistent in DB"
         );
 
@@ -1018,7 +1012,7 @@ impl Chain {
             deposit_info_vec: deposit_info_vec.clone(),
             withdrawals: withdrawals.clone(),
         };
-        let tip_block_hash = self.local_state.tip().hash().into();
+        let tip_block_hash = self.local_state.tip().hash();
         let chain_view = ChainView::new(&db, tip_block_hash);
 
         {
@@ -1141,7 +1135,7 @@ fn package_bad_blocks(db: &StoreTransaction, start_block_hash: &H256) -> Result<
         .collect();
     blocks.reverse();
     ensure!(
-        blocks.first().map(|b| b.hash().into()) == Some(*start_block_hash),
+        blocks.first().map(|b| b.hash()) == Some(*start_block_hash),
         "package_bad_blocks: start block hash does not match"
     );
     Ok(blocks)
diff --git a/crates/challenge/Cargo.toml b/crates/challenge/Cargo.toml
index f90d163de..bab62a2ae 100644
--- a/crates/challenge/Cargo.toml
+++ b/crates/challenge/Cargo.toml
@@ -1,15 +1,16 @@
 [package]
 name = "gw-challenge"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-gw-common = { path = "../common" }
+gw-types = { path = "../../gwos/crates/types" }
+gw-common = { path = "../../gwos/crates/common" }
+gw-smt = { path = "../smt" }
 gw-config = { path = "../config" }
-gw-types = { path = "../types" }
 gw-db = { path = "../db" }
 gw-store = { path = "../store" }
 gw-generator = { path = "../generator" }
diff --git a/crates/challenge/src/cancel_challenge.rs b/crates/challenge/src/cancel_challenge.rs
index ea151b187..9c013a9ca 100644
--- a/crates/challenge/src/cancel_challenge.rs
+++ b/crates/challenge/src/cancel_challenge.rs
@@ -2,9 +2,9 @@ use crate::types::{VerifyContext, VerifyWitness};
 
 use anyhow::{anyhow, Result};
 use ckb_types::prelude::{Builder, Entity};
-use gw_common::H256;
 use gw_config::ContractsCellDep;
 use gw_types::core::{DepType, SigningType, Status};
+use gw_types::h256::*;
 use gw_types::offchain::{CellInfo, InputCellInfo, RecoverAccount};
 use gw_types::packed::{
     CCTransactionSignatureWitness, CCTransactionWitness, CCWithdrawalWitness, CellDep, CellInput,
@@ -67,7 +67,6 @@ pub struct CancelChallengeOutput {
 impl CancelChallengeOutput {
     pub fn verifier_input(&self, tx_hash: H256, tx_index: u32) -> InputCellInfo {
         let (output, data) = self.verifier_cell.clone();
-        let tx_hash: [u8; 32] = tx_hash.into();
 
         let out_point = OutPoint::new_builder()
             .tx_hash(tx_hash.pack())
@@ -173,7 +172,7 @@ pub fn build_output(
                 witness,
             );
 
-            let data = cancel.build_verifier_data(receiver_script.hash().into());
+            let data = cancel.build_verifier_data(receiver_script.hash());
             Ok(cancel.build_output(data, Some(verifier_witness), None, None))
         }
         VerifyWitness::TxExecution {
@@ -226,7 +225,7 @@ pub fn build_output(
             };
 
             let recover_accounts = {
-                let owner_lock_hash = owner_lock.hash().into();
+                let owner_lock_hash = owner_lock.hash();
                 let accounts = recover_accounts.into_iter();
                 let to_cell = accounts.map(|a| build_recover_account_cell(owner_lock_hash, a));
                 let (cells, witnesses) = to_cell.unzip();
@@ -421,13 +420,11 @@ impl<'a> CancelChallenge<'a, CCTransactionSignatureWitness> {
 
     fn calc_tx_message(&self, receiver_script_hash: &H256) -> [u8; 32] {
         let raw_tx = self.verify_witness.l2tx().raw();
-        raw_tx
-            .calc_message(
-                &self.rollup_type_hash,
-                &H256::from(self.verifier_lock.hash()),
-                receiver_script_hash,
-            )
-            .into()
+        raw_tx.calc_message(
+            &self.rollup_type_hash,
+            &self.verifier_lock.hash(),
+            receiver_script_hash,
+        )
     }
 }
 
@@ -446,7 +443,7 @@ impl<'a> CancelChallenge<'a, CCWithdrawalWitness> {
 
     fn calc_withdrawal_message(&self) -> [u8; 32] {
         let raw_withdrawal = self.verify_witness.withdrawal().raw();
-        raw_withdrawal.calc_message(&self.rollup_type_hash).into()
+        raw_withdrawal.calc_message(&self.rollup_type_hash)
     }
 }
 
diff --git a/crates/challenge/src/context.rs b/crates/challenge/src/context.rs
index 31a6b1385..fa30925b3 100644
--- a/crates/challenge/src/context.rs
+++ b/crates/challenge/src/context.rs
@@ -3,14 +3,14 @@
 use crate::types::{RevertContext, RevertWitness, VerifyContext, VerifyWitness};
 
 use anyhow::{anyhow, Result};
-use gw_common::h256_ext::H256Ext;
+use gw_common::blake2b::new_blake2b;
 use gw_common::merkle_utils::{calculate_state_checkpoint, ckb_merkle_leaf_hash, CBMT};
-use gw_common::smt::Blake2bHasher;
-use gw_common::sparse_merkle_tree::CompiledMerkleProof;
 use gw_common::state::State;
-use gw_common::{blake2b::new_blake2b, H256};
 use gw_generator::traits::StateExt;
 use gw_generator::{types::vm::ChallengeContext, Generator};
+use gw_smt::smt::{Blake2bHasher, SMTH256};
+use gw_smt::smt_h256_ext::SMTH256Ext;
+use gw_smt::sparse_merkle_tree::CompiledMerkleProof;
 use gw_store::chain_view::ChainView;
 use gw_store::state::history::history_state::{RWConfig, ReadOpt, WriteOpt};
 use gw_store::state::{BlockStateDB, MemStateDB};
@@ -18,6 +18,7 @@ use gw_store::traits::chain_store::ChainStore;
 use gw_store::transaction::StoreTransaction;
 use gw_traits::CodeStore;
 use gw_types::core::ChallengeTargetType;
+use gw_types::h256::*;
 use gw_types::offchain::RecoverAccount;
 use gw_types::packed::{
     BlockHashEntry, BlockHashEntryVec, BlockInfo, Byte32, Bytes, CCTransactionSignatureWitness,
@@ -90,14 +91,14 @@ pub fn build_revert_context(
     // Build reverted block proof
     let (post_reverted_block_root, reverted_block_proof) = {
         let mut smt = db.reverted_block_smt()?;
-        let to_key = |b: &RawL2Block| H256::from(b.hash());
+        let to_key = |b: &RawL2Block| SMTH256::from(b.hash());
 
-        let keys: Vec<H256> = reverted_raw_blocks.iter().map(to_key).collect();
+        let keys: Vec<SMTH256> = reverted_raw_blocks.iter().map(to_key).collect();
         for key in keys.iter() {
-            smt.update(key.to_owned(), H256::one())?;
+            smt.update(key.to_owned(), SMTH256::one())?;
         }
 
-        let root = smt.root().to_owned();
+        let root: H256 = (*smt.root()).into();
         let proof = smt.merkle_proof(keys.clone())?.compile(keys.clone())?;
 
         (root, proof)
@@ -527,7 +528,7 @@ fn build_block_proof(
     let block_proof = {
         let smt = db.block_smt()?;
 
-        let smt_keys: Vec<H256> = raw_blocks.iter().map(|rb| rb.smt_key().into()).collect();
+        let smt_keys: Vec<SMTH256> = raw_blocks.iter().map(|rb| rb.smt_key().into()).collect();
         smt.merkle_proof(smt_keys.clone())?.compile(smt_keys)?
     };
 
@@ -536,11 +537,11 @@ fn build_block_proof(
 
 #[cfg(test)]
 mod tests {
-    use gw_common::{
-        merkle_utils::{calculate_ckb_merkle_root, ckb_merkle_leaf_hash, CBMTMerkleProof},
-        H256,
+    use gw_common::merkle_utils::{
+        calculate_ckb_merkle_root, ckb_merkle_leaf_hash, CBMTMerkleProof,
     };
     use gw_types::{
+        h256::*,
         packed::{L2Block, L2Transaction, RawL2Transaction},
         prelude::*,
     };
@@ -598,10 +599,9 @@ mod tests {
                     .map(|(id, l)| ckb_merkle_leaf_hash(id as u32, &l.witness_hash().into()))
                     .collect(),
             );
-            assert!(root.is_ok());
 
             // verify
-            assert!(proof.verify(&root.unwrap(), &proof_leaves));
+            assert!(proof.verify(&root, &proof_leaves));
         }
     }
 }
diff --git a/crates/challenge/src/enter_challenge.rs b/crates/challenge/src/enter_challenge.rs
index cd50335bd..15d5513c1 100644
--- a/crates/challenge/src/enter_challenge.rs
+++ b/crates/challenge/src/enter_challenge.rs
@@ -1,7 +1,7 @@
 use ckb_types::prelude::{Builder, Entity};
-use gw_common::H256;
 use gw_generator::types::vm::ChallengeContext;
 use gw_types::core::{ScriptHashType, Status};
+use gw_types::h256::*;
 use gw_types::packed::{
     Byte32, CellOutput, ChallengeLockArgs, ChallengeTarget, ChallengeWitness, GlobalState,
     RollupAction, RollupActionUnion, RollupEnterChallenge, Script, WitnessArgs,
diff --git a/crates/challenge/src/offchain.rs b/crates/challenge/src/offchain.rs
index 0cccb5823..3bb832620 100644
--- a/crates/challenge/src/offchain.rs
+++ b/crates/challenge/src/offchain.rs
@@ -3,13 +3,13 @@
 use anyhow::{anyhow, bail, Result};
 use ckb_chain_spec::consensus::MAX_BLOCK_BYTES;
 use gw_common::registry_address::RegistryAddress;
-use gw_common::H256;
 use gw_config::{BlockProducerConfig, DebugConfig, OffChainValidatorConfig};
 use gw_rpc_client::contract::ContractsCellDepManager;
 use gw_rpc_client::rpc_client::RPCClient;
 use gw_store::state::MemStateDB;
 use gw_store::transaction::StoreTransaction;
 use gw_types::core::DepType;
+use gw_types::h256::*;
 use gw_types::offchain::{CellInfo, InputCellInfo};
 use gw_types::packed::{
     CellDep, CellInput, L2Block, OutPoint, OutPointVec, WithdrawalRequestExtra,
diff --git a/crates/challenge/src/offchain/mock_block.rs b/crates/challenge/src/offchain/mock_block.rs
index f00f4b3f6..9116063b5 100644
--- a/crates/challenge/src/offchain/mock_block.rs
+++ b/crates/challenge/src/offchain/mock_block.rs
@@ -1,23 +1,23 @@
 use crate::types::{VerifyContext, VerifyWitness};
 
 use anyhow::{anyhow, bail, Context, Result};
-use gw_common::h256_ext::H256Ext;
 use gw_common::merkle_utils::{
     calculate_ckb_merkle_root, calculate_state_checkpoint, ckb_merkle_leaf_hash, CBMT,
 };
 use gw_common::registry_address::RegistryAddress;
-use gw_common::smt::{Blake2bHasher, SMT};
-use gw_common::sparse_merkle_tree::default_store::DefaultStore;
 use gw_common::state::{
     build_account_field_key, State, GW_ACCOUNT_NONCE_TYPE, GW_ACCOUNT_SCRIPT_HASH_TYPE,
 };
-use gw_common::H256;
 use gw_generator::traits::StateExt;
+use gw_smt::smt::{Blake2bHasher, SMT, SMTH256};
+use gw_smt::smt_h256_ext::SMTH256Ext;
+use gw_smt::sparse_merkle_tree::default_store::DefaultStore;
 use gw_store::state::traits::JournalDB;
 use gw_store::state::MemStateDB;
 use gw_store::transaction::StoreTransaction;
 use gw_traits::CodeStore;
-use gw_types::core::{ChallengeTargetType, Status, Timepoint};
+use gw_types::core::{ChallengeTargetType, Status};
+use gw_types::h256::*;
 use gw_types::offchain::RunResult;
 use gw_types::packed::{
     AccountMerkleState, BlockMerkleState, Byte32, CCTransactionSignatureWitness,
@@ -25,13 +25,12 @@ use gw_types::packed::{
     RawL2Block, Script, SubmitTransactions, SubmitWithdrawals, Uint64, WithdrawalRequestExtra,
 };
 use gw_types::prelude::*;
-use gw_utils::RollupContext;
+use gw_utils::{global_state_finalized_timepoint, RollupContext};
 
 type MemTree = MemStateDB;
 
 pub struct MockBlockParam {
     rollup_context: RollupContext,
-    finality_blocks: u64,
     number: u64,
     rollup_config_hash: Byte32,
     block_producer: RegistryAddress,
@@ -61,7 +60,6 @@ impl MockBlockParam {
         reverted_block_root: H256,
     ) -> Self {
         MockBlockParam {
-            finality_blocks: rollup_context.rollup_config.finality_blocks().unpack(),
             rollup_config_hash: rollup_context.rollup_config.hash().pack(),
             rollup_context,
             block_producer,
@@ -301,14 +299,16 @@ impl MockBlockParam {
     ) -> Result<GlobalState> {
         let block_smt = db.block_smt()?;
         let block_proof = block_smt
-            .merkle_proof(vec![H256::from_u64(self.number)])
+            .merkle_proof(vec![SMTH256::from_u64(self.number)])
             .map_err(|err| anyhow!("merkle proof error: {:?}", err))?
-            .compile(vec![H256::from_u64(self.number)])?;
+            .compile(vec![SMTH256::from_u64(self.number)])?;
         let post_block = {
-            let post_block_root = block_proof.compute_root::<Blake2bHasher>(vec![(
-                raw_block.smt_key().into(),
-                raw_block.hash().into(),
-            )])?;
+            let post_block_root: H256 = block_proof
+                .compute_root::<Blake2bHasher>(vec![(
+                    raw_block.smt_key().into(),
+                    raw_block.hash().into(),
+                )])?
+                .into();
             let block_count = self.number + 1;
             BlockMerkleState::new_builder()
                 .merkle_root(post_block_root.pack())
@@ -316,15 +316,12 @@ impl MockBlockParam {
                 .build()
         };
 
-        let last_finalized_timepoint = if self
-            .rollup_context
-            .fork_config
-            .use_timestamp_as_timepoint(self.number)
-        {
-            unimplemented!()
-        } else {
-            Timepoint::from_block_number(self.number.saturating_sub(self.finality_blocks))
-        };
+        let last_finalized_timepoint = global_state_finalized_timepoint(
+            &self.rollup_context.rollup_config,
+            &self.rollup_context.fork_config,
+            self.number,
+            self.timestamp.unpack(),
+        );
         let global_state = GlobalState::new_builder()
             .account(post_account)
             .block(post_block)
@@ -344,9 +341,9 @@ impl MockBlockParam {
         sender_script: Script,
         owner_lock: Script,
     ) -> Result<VerifyContext> {
-        let mut tree: SMT<DefaultStore<H256>> = Default::default();
+        let mut tree: SMT<DefaultStore<SMTH256>> = Default::default();
         for (index, witness_hash) in self.withdrawals.witness_hashes.iter().enumerate() {
-            tree.update(H256::from_u32(index as u32), witness_hash.to_owned())?;
+            tree.update(SMTH256::from_u32(index as u32), (*witness_hash).into())?;
         }
 
         let withdrawal_index = self.withdrawals.witness_hashes.len().saturating_sub(1) as u32;
@@ -391,11 +388,11 @@ impl MockBlockParam {
         let kv_state: Vec<(H256, H256)> = vec![
             (
                 build_account_field_key(sender_id, GW_ACCOUNT_SCRIPT_HASH_TYPE),
-                sender_script.hash().into(),
+                sender_script.hash(),
             ),
             (
                 build_account_field_key(receiver_id, GW_ACCOUNT_SCRIPT_HASH_TYPE),
-                receiver_script.hash().into(),
+                receiver_script.hash(),
             ),
             (
                 build_account_field_key(sender_id, GW_ACCOUNT_NONCE_TYPE),
@@ -407,7 +404,7 @@ impl MockBlockParam {
             Unpack::<u32>::unpack(&tx.raw().nonce())
         );
 
-        let touched_keys: Vec<H256> = kv_state.iter().map(|(key, _)| key.to_owned()).collect();
+        let touched_keys: Vec<SMTH256> = kv_state.iter().map(|(key, _)| (*key).into()).collect();
         let kv_state_proof = {
             let smt = mem_tree.inner_smt_tree();
             smt.merkle_proof(touched_keys.clone())?
@@ -584,12 +581,12 @@ impl RawBlockWithdrawalRequests {
     }
 
     fn contains(&self, req: &WithdrawalRequestExtra) -> bool {
-        self.witness_hashes.contains(&req.witness_hash().into())
+        self.witness_hashes.contains(&req.witness_hash())
     }
 
     fn push(&mut self, req: WithdrawalRequestExtra, post_account: AccountMerkleState) {
         let wth_index = self.witness_hashes.len() as u32;
-        let witness_hash: H256 = req.witness_hash().into();
+        let witness_hash: H256 = req.witness_hash();
         let merkle_leaf_hash = ckb_merkle_leaf_hash(wth_index, &witness_hash);
 
         self.witness_hashes.push(witness_hash);
@@ -599,8 +596,7 @@ impl RawBlockWithdrawalRequests {
     }
 
     fn submit_withdrawals(&self) -> Result<SubmitWithdrawals> {
-        let root = calculate_ckb_merkle_root(self.merkle_leaf_hashes.clone())
-            .map_err(|err| anyhow!("mock submit withdrawal error: {}", err))?;
+        let root = calculate_ckb_merkle_root(self.merkle_leaf_hashes.clone());
         let count = self.inner.len() as u32;
 
         Ok(SubmitWithdrawals::new_builder()
@@ -641,12 +637,12 @@ impl RawBlockTransactions {
     }
 
     fn contains(&self, tx: &L2Transaction) -> bool {
-        self.witness_hashes.contains(&tx.witness_hash().into())
+        self.witness_hashes.contains(&tx.witness_hash())
     }
 
     fn push(&mut self, tx: L2Transaction, post_account: AccountMerkleState) {
         let tx_index = self.merkle_leaf_hashes.len() as u32;
-        let witness_hash: H256 = tx.witness_hash().into();
+        let witness_hash: H256 = tx.witness_hash();
         let merkle_leaf_hash = ckb_merkle_leaf_hash(tx_index, &witness_hash);
 
         self.witness_hashes.push(witness_hash);
@@ -656,8 +652,7 @@ impl RawBlockTransactions {
     }
 
     fn submit_transactions(&self) -> Result<SubmitTransactions> {
-        let root = calculate_ckb_merkle_root(self.merkle_leaf_hashes.clone())
-            .map_err(|err| anyhow!("mock submit transaction error: {}", err))?;
+        let root = calculate_ckb_merkle_root(self.merkle_leaf_hashes.clone());
         let count = self.inner.len() as u32;
 
         Ok(SubmitTransactions::new_builder()
diff --git a/crates/challenge/src/offchain/mock_tx.rs b/crates/challenge/src/offchain/mock_tx.rs
index ae358776b..cf3851c65 100644
--- a/crates/challenge/src/offchain/mock_tx.rs
+++ b/crates/challenge/src/offchain/mock_tx.rs
@@ -12,10 +12,10 @@ use gw_utils::wallet::Wallet;
 use anyhow::Result;
 use arc_swap::Guard;
 use gw_common::blake2b::new_blake2b;
-use gw_common::H256;
 use gw_config::{BlockProducerConfig, ContractsCellDep};
 use gw_generator::types::vm::ChallengeContext;
 use gw_types::bytes::Bytes;
+use gw_types::h256::*;
 use gw_types::offchain::{CellInfo, InputCellInfo};
 use gw_types::packed::{
     Byte32, CellDep, CellInput, CellOutput, ChallengeTarget, ChallengeWitness, GlobalState,
diff --git a/crates/challenge/src/revert.rs b/crates/challenge/src/revert.rs
index dbffdd741..5ee3b4a5c 100644
--- a/crates/challenge/src/revert.rs
+++ b/crates/challenge/src/revert.rs
@@ -3,9 +3,9 @@ use crate::types::{RevertContext, RevertWitness};
 use anyhow::{anyhow, Result};
 use ckb_types::prelude::Reader;
 use ckb_types::prelude::{Builder, Entity};
-use gw_common::smt::Blake2bHasher;
-use gw_common::H256;
-use gw_types::core::{Status, Timepoint};
+use gw_smt::smt::{Blake2bHasher, SMTH256};
+use gw_types::core::Status;
+use gw_types::h256::H256;
 use gw_types::offchain::CellInfo;
 use gw_types::packed::BlockMerkleState;
 use gw_types::packed::ChallengeLockArgsReader;
@@ -19,11 +19,10 @@ use gw_types::{
     bytes::Bytes,
     prelude::{Pack, Unpack},
 };
-use gw_utils::RollupContext;
+use gw_utils::{global_state_finalized_timepoint, RollupContext};
 
 pub struct Revert<'a> {
     rollup_context: RollupContext,
-    finality_blocks: u64,
     reward_burn_rate: u8,
     prev_global_state: GlobalState,
     challenge_cell: &'a CellInfo, // capacity and rewards lock
@@ -50,17 +49,15 @@ impl<'a> Revert<'a> {
         revert_context: RevertContext,
     ) -> Self {
         let reward_burn_rate = rollup_context.rollup_config.reward_burn_rate().into();
-        let finality_blocks = rollup_context.rollup_config.finality_blocks().unpack();
 
         Revert {
             rollup_context,
-            finality_blocks,
             prev_global_state,
             challenge_cell,
             stake_cells,
             burn_lock,
             reward_burn_rate,
-            post_reverted_block_root: revert_context.post_reverted_block_root.into(),
+            post_reverted_block_root: revert_context.post_reverted_block_root,
             revert_witness: revert_context.revert_witness,
         }
     }
@@ -86,12 +83,14 @@ impl<'a> Revert<'a> {
         };
         let block_merkle_state = {
             let leaves = {
-                let to_leave = |b: RawL2Block| (b.smt_key().into(), H256::zero());
+                let to_leave = |b: RawL2Block| (b.smt_key().into(), SMTH256::zero());
                 let reverted_blocks = self.revert_witness.reverted_blocks.clone();
                 reverted_blocks.into_iter().map(to_leave)
             };
             let block_merkle_proof = self.revert_witness.block_proof.clone();
-            let block_root = block_merkle_proof.compute_root::<Blake2bHasher>(leaves.collect())?;
+            let block_root: H256 = block_merkle_proof
+                .compute_root::<Blake2bHasher>(leaves.collect())?
+                .into();
             let block_count = first_reverted_block.number();
 
             BlockMerkleState::new_builder()
@@ -99,26 +98,27 @@ impl<'a> Revert<'a> {
                 .count(block_count)
                 .build()
         };
-        let last_finalized_timepoint = if self
-            .rollup_context
-            .fork_config
-            .use_timestamp_as_timepoint(first_reverted_block.number().unpack())
-        {
-            Timepoint::Timestamp(
-                first_reverted_block
-                    .timestamp()
-                    .unpack()
-                    .saturating_sub(self.rollup_context.rollup_config.finality_time_in_ms()),
-            )
-        } else {
-            Timepoint::from_block_number(
-                first_reverted_block
-                    .number()
-                    .unpack()
-                    .saturating_sub(1)
-                    .saturating_sub(self.finality_blocks),
-            )
-        };
+
+        // NOTE: When revert in v1, `Fork::use_timestamp_as_timepoint()` is disabled,
+        //       revert the last_finalized_timepoint to the **the previous block that did not revert**;
+        //       when revert in v2, `Fork::use_timestamp_as_timepoint()` is enabled,
+        //       keep the last_finalized_timepoint up to date, which is the last block timestamp
+        let last_reverted_block = self
+            .revert_witness
+            .reverted_blocks
+            .clone()
+            .into_iter()
+            .last()
+            .ok_or_else(|| anyhow!("no last block"))?;
+        let last_block_timestamp = last_reverted_block.timestamp().unpack();
+        let previous_non_reverted_block_number =
+            first_reverted_block.number().unpack().saturating_sub(1);
+        let reverted_last_finalized_timepoint = global_state_finalized_timepoint(
+            &self.rollup_context.rollup_config,
+            &self.rollup_context.fork_config,
+            previous_non_reverted_block_number,
+            last_block_timestamp,
+        );
         let running_status: u8 = Status::Running.into();
 
         let post_global_state = self
@@ -128,7 +128,7 @@ impl<'a> Revert<'a> {
             .block(block_merkle_state)
             .tip_block_hash(first_reverted_block.parent_block_hash())
             .tip_block_timestamp(self.revert_witness.new_tip_block.timestamp())
-            .last_finalized_timepoint(last_finalized_timepoint.full_value().pack())
+            .last_finalized_timepoint(reverted_last_finalized_timepoint.full_value().pack())
             .reverted_block_root(self.post_reverted_block_root.pack())
             .status(running_status.into())
             .build();
diff --git a/crates/challenge/src/types.rs b/crates/challenge/src/types.rs
index 5d2b5a8f2..95703d8f3 100644
--- a/crates/challenge/src/types.rs
+++ b/crates/challenge/src/types.rs
@@ -1,4 +1,5 @@
-use gw_common::{sparse_merkle_tree::CompiledMerkleProof, H256};
+use gw_smt::sparse_merkle_tree::CompiledMerkleProof;
+use gw_types::h256::*;
 use gw_types::offchain::RecoverAccount;
 use gw_types::packed::{
     Bytes, CCTransactionSignatureWitness, CCTransactionWitness, CCWithdrawalWitness, RawL2Block,
diff --git a/crates/config/Cargo.toml b/crates/config/Cargo.toml
index 5b676d7cf..85c7b4b16 100644
--- a/crates/config/Cargo.toml
+++ b/crates/config/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-config"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 
diff --git a/crates/config/src/config.rs b/crates/config/src/config.rs
index 393978aa3..b76008980 100644
--- a/crates/config/src/config.rs
+++ b/crates/config/src/config.rs
@@ -79,7 +79,10 @@ pub struct RPCServerConfig {
 #[derive(Clone, Default, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct RPCClientConfig {
-    pub indexer_url: String,
+    /// Specify standalone ckb indexer URL.
+    ///
+    /// If this is None we use CKB builtin indexer RPC instead.
+    pub indexer_url: Option<String>,
     pub ckb_url: String,
 }
 
diff --git a/crates/db/Cargo.toml b/crates/db/Cargo.toml
index d46859c88..b244bff18 100644
--- a/crates/db/Cargo.toml
+++ b/crates/db/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-db"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 
diff --git a/crates/dynamic-config/Cargo.toml b/crates/dynamic-config/Cargo.toml
index 01b1e64f7..efdd65927 100644
--- a/crates/dynamic-config/Cargo.toml
+++ b/crates/dynamic-config/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-dynamic-config"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 
diff --git a/crates/dynamic-config/src/whitelist_config.rs b/crates/dynamic-config/src/whitelist_config.rs
index d2d1ae635..84293c6b3 100644
--- a/crates/dynamic-config/src/whitelist_config.rs
+++ b/crates/dynamic-config/src/whitelist_config.rs
@@ -58,7 +58,7 @@ fn get_allow_list(
         rpc_config
             .sudt_proxy_code_hashes
             .into_iter()
-            .map(|hash| hash.0.into())
+            .map(|hash| hash.0)
             .collect(),
     );
     (
diff --git a/crates/generator/Cargo.toml b/crates/generator/Cargo.toml
index 04e61f060..a2648b687 100644
--- a/crates/generator/Cargo.toml
+++ b/crates/generator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-generator"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 
@@ -12,8 +12,9 @@ detect-asm = ["ckb-vm/detect-asm", "ckb-vm-aot"]
 enable-always-success-lock = []
 
 [dependencies]
-gw-types = { path = "../types" }
-gw-common = { path = "../common" }
+gw-types = { path = "../../gwos/crates/types" }
+gw-common = { path = "../../gwos/crates/common" }
+gw-smt = { path = "../smt" }
 gw-config = { path = "../config" }
 gw-store = { path = "../store" }
 gw-traits = { path = "../traits" }
@@ -25,7 +26,7 @@ ckb-vm-aot = { version = "=0.22.0", optional = true }
 thiserror = "1.0"
 lazy_static = "1.4"
 rlp = "0.5.0"
-secp256k1 = { version = "0.20", features = ["recovery"] }
+secp256k1 = { version = "0.24", features = ["recovery"] }
 substrate-bn = { git = "https://github.com/paritytech/bn.git", rev = "63f8c58" }
 sha3 = "0.10.6"
 log = "0.4"
diff --git a/crates/generator/src/account_lock_manage/always_success.rs b/crates/generator/src/account_lock_manage/always_success.rs
index 8e7c613e5..a232f4e9b 100644
--- a/crates/generator/src/account_lock_manage/always_success.rs
+++ b/crates/generator/src/account_lock_manage/always_success.rs
@@ -1,6 +1,7 @@
-use gw_common::{registry_address::RegistryAddress, H256};
+use gw_common::registry_address::RegistryAddress;
 use gw_types::{
     bytes::Bytes,
+    h256::*,
     packed::{L2Transaction, Script},
 };
 use gw_utils::RollupContext;
diff --git a/crates/generator/src/account_lock_manage/eip712/types.rs b/crates/generator/src/account_lock_manage/eip712/types.rs
index ce8b91154..780c509bd 100644
--- a/crates/generator/src/account_lock_manage/eip712/types.rs
+++ b/crates/generator/src/account_lock_manage/eip712/types.rs
@@ -1,9 +1,10 @@
 use std::convert::{TryFrom, TryInto};
 
 use anyhow::{anyhow, bail, Result};
-use gw_common::{builtins::ETH_REGISTRY_ACCOUNT_ID, H256};
+use gw_common::builtins::ETH_REGISTRY_ACCOUNT_ID;
 use gw_types::{
     core::ScriptHashType,
+    h256::*,
     packed::{RawL2Transaction, RawWithdrawalRequest},
     prelude::Unpack,
 };
@@ -182,7 +183,7 @@ impl L2Transaction {
             chain_id: data.chain_id().unpack(),
             nonce: data.nonce().unpack(),
             from: sender_address,
-            to: to_script_hash.into(),
+            to: to_script_hash,
             args: data.args().unpack(),
         };
         Ok(tx)
@@ -466,7 +467,7 @@ mod tests {
             buf
         };
         let pubkey_hash = Secp256k1Eth::default()
-            .recover(message.into(), &signature)
+            .recover(message, &signature)
             .unwrap();
         assert_eq!(hex::encode(mail.from.wallet), hex::encode(pubkey_hash));
     }
@@ -517,7 +518,7 @@ mod tests {
         let message = withdrawal.eip712_message(domain_seperator.hash_struct());
         let signature: [u8; 65] = hex::decode("22cae59f1bfaf58f423d1a414cbcaefd45a89dd54c9142fccbb2473c74f4741b45f77f1f3680b8c0b6362957c8d79f96a683a859ccbf22a6cfc1ebc311b936d301").unwrap().try_into().unwrap();
         let pubkey_hash = Secp256k1Eth::default()
-            .recover(message.into(), &signature)
+            .recover(message, &signature)
             .unwrap();
         assert_eq!(
             "cc3e7fb0176a0e22a7f675306ceeb61d26eb0dc4".to_string(),
@@ -555,7 +556,7 @@ mod tests {
         let message = tx.eip712_message(domain_seperator.hash_struct());
         let signature: [u8; 65] = hex::decode("64b164f5303000c283119974d7ba8f050cc7429984af904134d5cda6d3ce045934cc6b6f513ec939c2ae4cfb9cbee249ba8ae86f6274e4035c150f9c8e634a3a1b").unwrap().try_into().unwrap();
         let pubkey_hash = Secp256k1Eth::default()
-            .recover(message.into(), &signature)
+            .recover(message, &signature)
             .unwrap();
         assert_eq!(
             "e8ae579256c3b84efb76bbb69cb6bcbef1375f00".to_string(),
diff --git a/crates/generator/src/account_lock_manage/mod.rs b/crates/generator/src/account_lock_manage/mod.rs
index 2e91d5aff..6dcac0c85 100644
--- a/crates/generator/src/account_lock_manage/mod.rs
+++ b/crates/generator/src/account_lock_manage/mod.rs
@@ -1,6 +1,7 @@
 use std::{collections::HashMap, sync::Arc};
 
-use gw_common::{registry_address::RegistryAddress, H256};
+use gw_common::registry_address::RegistryAddress;
+use gw_types::h256::*;
 use gw_types::{
     bytes::Bytes,
     packed::{L2Transaction, Script, WithdrawalRequestExtra},
diff --git a/crates/generator/src/account_lock_manage/secp256k1.rs b/crates/generator/src/account_lock_manage/secp256k1.rs
index ffc7b9e71..cd84d58ad 100644
--- a/crates/generator/src/account_lock_manage/secp256k1.rs
+++ b/crates/generator/src/account_lock_manage/secp256k1.rs
@@ -7,17 +7,17 @@ use crate::account_lock_manage::eip712::types::Withdrawal;
 use crate::error::LockAlgorithmError;
 use anyhow::bail;
 use gw_common::registry_address::RegistryAddress;
-use gw_common::H256;
 use gw_types::packed::WithdrawalRequestExtra;
 use gw_types::prelude::*;
 use gw_types::{
     bytes::Bytes,
+    h256::*,
     packed::{L2Transaction, RawL2Transaction, Script},
 };
 use gw_utils::polyjuice_parser::PolyjuiceParser;
 use gw_utils::RollupContext;
 use lazy_static::lazy_static;
-use secp256k1::recovery::{RecoverableSignature, RecoveryId};
+use secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
 use sha3::{Digest, Keccak256};
 
 lazy_static! {
@@ -55,7 +55,7 @@ impl Secp256k1Eth {
         hasher.update(&rlp_data);
         let signing_message: [u8; 32] = hasher.finalize().into();
 
-        Ok(signing_message.into())
+        Ok(signing_message)
     }
 
     pub fn eip712_signing_message(
@@ -71,7 +71,7 @@ impl Secp256k1Eth {
         )?;
         let message = typed_tx.eip712_message(Self::domain_with_chain_id(chain_id).hash_struct());
 
-        Ok(message.into())
+        Ok(message)
     }
 
     pub fn domain_with_chain_id(chain_id: u64) -> EIP712Domain {
@@ -133,7 +133,7 @@ impl LockAlgorithm for Secp256k1Eth {
         let msg = secp256k1::Message::from_slice(message.as_slice())
             .map_err(|err| LockAlgorithmError::InvalidSignature(err.to_string()))?;
         let pubkey = SECP256K1
-            .recover(&msg, &signature)
+            .recover_ecdsa(&msg, &signature)
             .map_err(|err| LockAlgorithmError::InvalidSignature(err.to_string()))?;
 
         let mut hasher = Keccak256::new();
@@ -164,7 +164,6 @@ impl LockAlgorithm for Secp256k1Eth {
             let mut hasher = Keccak256::new();
             hasher.update(&rlp_data);
             let signing_message: [u8; 32] = hasher.finalize().into();
-            let signing_message = H256::from(signing_message);
             self.verify_alone(
                 sender_script.args().unpack(),
                 tx.signature().unpack(),
@@ -182,7 +181,7 @@ impl LockAlgorithm for Secp256k1Eth {
         let raw_tx = tx.raw();
         let chain_id = raw_tx.chain_id().unpack();
 
-        let to_script_hash = receiver_script.hash().into();
+        let to_script_hash = receiver_script.hash();
 
         let typed_tx = crate::account_lock_manage::eip712::types::L2Transaction::from_raw(
             &raw_tx,
@@ -196,7 +195,7 @@ impl LockAlgorithm for Secp256k1Eth {
         self.verify_alone(
             sender_script.args().unpack(),
             tx.signature().unpack(),
-            message.into(),
+            message,
         )?;
         Ok(())
     }
@@ -229,7 +228,7 @@ impl LockAlgorithm for Secp256k1Eth {
         self.verify_alone(
             sender_script.args().unpack(),
             withdrawal.request().signature().unpack(),
-            message.into(),
+            message,
         )?;
         Ok(())
     }
diff --git a/crates/generator/src/backend_manage.rs b/crates/generator/src/backend_manage.rs
index 627bca105..2bcb2b4d2 100644
--- a/crates/generator/src/backend_manage.rs
+++ b/crates/generator/src/backend_manage.rs
@@ -1,7 +1,8 @@
 use anyhow::{bail, Context, Result};
-use gw_common::{blake2b::new_blake2b, H256};
+use gw_common::blake2b::new_blake2b;
 use gw_config::{BackendConfig, BackendForkConfig, BackendType};
 use gw_types::bytes::Bytes;
+use gw_types::h256::*;
 use std::{collections::HashMap, fs};
 
 #[cfg(has_asm)]
@@ -44,14 +45,14 @@ impl Backend {
                 hasher.update(&validator);
                 let mut buf = [0u8; 32];
                 hasher.finalize(&mut buf);
-                buf.into()
+                buf
             };
             let generator = {
                 let mut hasher = new_blake2b();
                 hasher.update(&generator);
                 let mut buf = [0u8; 32];
                 hasher.finalize(&mut buf);
-                buf.into()
+                buf
             };
 
             BackendCheckSum {
@@ -127,13 +128,9 @@ impl BackendManage {
                     format!("load generator from {}", generator_path.to_string_lossy())
                 })?
                 .into();
-            let validator_script_type_hash = {
-                let hash: [u8; 32] = validator_script_type_hash.into();
-                hash.into()
-            };
             let backend = Backend::new(
                 backend_type,
-                validator_script_type_hash,
+                validator_script_type_hash.into(),
                 validator,
                 generator,
             );
@@ -248,24 +245,15 @@ mod tests {
         };
         m.register_backend_fork(config, false).unwrap();
         assert!(m.get_backends_at_height(0).is_none(), "no backends at 0");
+        assert!(m.get_backend(1, &[42u8; 32]).is_some(), "get backend at 1");
         assert!(
-            m.get_backend(1, &[42u8; 32].into()).is_some(),
-            "get backend at 1"
-        );
-        assert!(
-            m.get_backend(100, &[42u8; 32].into()).is_some(),
+            m.get_backend(100, &[42u8; 32]).is_some(),
             "get backend at 100"
         );
+        assert!(m.get_backend(0, &[43u8; 32]).is_none(), "get backend at 0");
+        assert!(m.get_backend(1, &[43u8; 32]).is_some(), "get backend at 1");
         assert!(
-            m.get_backend(0, &[43u8; 32].into()).is_none(),
-            "get backend at 0"
-        );
-        assert!(
-            m.get_backend(1, &[43u8; 32].into()).is_some(),
-            "get backend at 1"
-        );
-        assert!(
-            m.get_backend(100, &[43u8; 32].into()).is_some(),
+            m.get_backend(100, &[43u8; 32]).is_some(),
             "get backend at 100"
         );
 
@@ -290,55 +278,34 @@ mod tests {
         assert!(m.get_backends_at_height(0).is_none(), "no backends at 0");
         // sudt
         assert_eq!(
-            m.get_backend(4, &[42u8; 32].into())
-                .unwrap()
-                .generator
-                .to_vec(),
+            m.get_backend(4, &[42u8; 32]).unwrap().generator.to_vec(),
             b"sudt_v0".to_vec(),
         );
         assert_eq!(
-            m.get_backend(5, &[42u8; 32].into())
-                .unwrap()
-                .generator
-                .to_vec(),
+            m.get_backend(5, &[42u8; 32]).unwrap().generator.to_vec(),
             b"sudt_v1".to_vec(),
         );
         assert_eq!(
-            m.get_backend(42, &[42u8; 32].into())
-                .unwrap()
-                .generator
-                .to_vec(),
+            m.get_backend(42, &[42u8; 32]).unwrap().generator.to_vec(),
             b"sudt_v1".to_vec(),
         );
         // meta
-        assert!(m.get_backend(1, &[41u8; 32].into()).is_none());
+        assert!(m.get_backend(1, &[41u8; 32]).is_none());
         assert_eq!(
-            m.get_backend(5, &[41u8; 32].into())
-                .unwrap()
-                .generator
-                .to_vec(),
+            m.get_backend(5, &[41u8; 32]).unwrap().generator.to_vec(),
             b"meta_v0".to_vec(),
         );
         assert_eq!(
-            m.get_backend(42, &[41u8; 32].into())
-                .unwrap()
-                .generator
-                .to_vec(),
+            m.get_backend(42, &[41u8; 32]).unwrap().generator.to_vec(),
             b"meta_v0".to_vec(),
         );
         // addr
         assert_eq!(
-            m.get_backend(1, &[43u8; 32].into())
-                .unwrap()
-                .generator
-                .to_vec(),
+            m.get_backend(1, &[43u8; 32]).unwrap().generator.to_vec(),
             b"addr_v0".to_vec(),
         );
         assert_eq!(
-            m.get_backend(42, &[43u8; 32].into())
-                .unwrap()
-                .generator
-                .to_vec(),
+            m.get_backend(42, &[43u8; 32]).unwrap().generator.to_vec(),
             b"addr_v0".to_vec(),
         );
     }
diff --git a/crates/generator/src/error.rs b/crates/generator/src/error.rs
index cf7490e76..1a218830f 100644
--- a/crates/generator/src/error.rs
+++ b/crates/generator/src/error.rs
@@ -1,8 +1,9 @@
 use std::borrow::Cow;
 
 use ckb_vm::Error as VMError;
-use gw_common::{error::Error as StateError, sparse_merkle_tree::error::Error as SMTError, H256};
-use gw_types::{offchain::CycleMeter, packed::Byte32};
+use gw_common::error::Error as StateError;
+use gw_smt::sparse_merkle_tree::error::Error as SMTError;
+use gw_types::{h256::H256, offchain::CycleMeter, packed::Byte32};
 use thiserror::Error;
 
 /// Error
diff --git a/crates/generator/src/generator.rs b/crates/generator/src/generator.rs
index 9ce87b618..9b95bd33d 100644
--- a/crates/generator/src/generator.rs
+++ b/crates/generator/src/generator.rs
@@ -21,10 +21,8 @@ use arc_swap::ArcSwapOption;
 use gw_common::{
     builtins::{CKB_SUDT_ACCOUNT_ID, ETH_REGISTRY_ACCOUNT_ID},
     error::Error as StateError,
-    h256_ext::H256Ext,
     registry_address::RegistryAddress,
     state::{build_account_key, State, SUDT_TOTAL_SUPPLY_KEY},
-    H256,
 };
 
 use gw_config::{ContractLogConfig, ForkConfig, SyscallCyclesConfig};
@@ -36,6 +34,8 @@ use gw_traits::{ChainView, CodeStore};
 use gw_types::{
     bytes::Bytes,
     core::{ChallengeTargetType, ScriptHashType},
+    h256::H256Ext,
+    h256::*,
     offchain::{CycleMeter, RunResult},
     packed::{
         AccountMerkleState, BlockInfo, ChallengeTarget, DepositInfoVec, L2Block, L2Transaction,
@@ -319,19 +319,16 @@ impl Generator {
 
         // check signature
         let account_script = state
-            .get_script(&account_script_hash.into())
+            .get_script(&account_script_hash)
             .ok_or(StateError::MissingKey)?;
         let lock_code_hash: [u8; 32] = account_script.code_hash().unpack();
         let lock_algo = self
             .account_lock_manage
-            .get_lock_algorithm(&lock_code_hash.into())
+            .get_lock_algorithm(&lock_code_hash)
             .ok_or(LockAlgorithmError::UnknownAccountLock)?;
 
         let address = state
-            .get_registry_address_by_script_hash(
-                raw.registry_id().unpack(),
-                &account_script_hash.into(),
-            )?
+            .get_registry_address_by_script_hash(raw.registry_id().unpack(), &account_script_hash)?
             .ok_or(AccountError::RegistryAddressNotFound)?;
 
         lock_algo.verify_withdrawal(self.rollup_context(), account_script, withdrawal, address)?;
@@ -374,7 +371,7 @@ impl Generator {
 
         let lock_algo = self
             .account_lock_manage()
-            .get_lock_algorithm(&lock_code_hash.into())
+            .get_lock_algorithm(&lock_code_hash)
             .ok_or(LockAlgorithmError::UnknownAccountLock)?;
 
         let sender_address = state
@@ -416,8 +413,26 @@ impl Generator {
             }
         };
 
-        // apply withdrawal to state
         let block_hash = raw_block.hash();
+        let skip_checkpoint_check = skipped_invalid_block_list.contains(&block_hash);
+
+        // check prev state
+        if !skip_checkpoint_check {
+            let prev_merkle_root: H256 = raw_block.prev_account().merkle_root().unpack();
+            let prev_merkle_count: u32 = raw_block.prev_account().count().unpack();
+            assert_eq!(
+                state.calculate_root().expect("check prev root"),
+                prev_merkle_root,
+                "wrong block prev root"
+            );
+            assert_eq!(
+                state.get_account_count().expect("check prev count"),
+                prev_merkle_count,
+                "wrong block prev account count"
+            );
+        }
+
+        // apply withdrawal to state
         let block_producer_address = {
             let block_producer: Bytes = block_info.block_producer().unpack();
             match RegistryAddress::from_slice(&block_producer) {
@@ -448,7 +463,7 @@ impl Generator {
             let now = Instant::now();
             if let Err(error) = self.check_withdrawal_signature(&state, &request) {
                 let target = build_challenge_target(
-                    block_hash.into(),
+                    block_hash,
                     ChallengeTargetType::Withdrawal,
                     wth_idx as u32,
                 );
@@ -510,7 +525,6 @@ impl Generator {
         // handle transactions
         let mut offchain_used_cycles: u64 = 0;
         let mut tx_receipts = Vec::with_capacity(args.l2block.transactions().len());
-        let skip_checkpoint_check = skipped_invalid_block_list.contains(&block_hash.into());
         if skip_checkpoint_check {
             log::warn!(
                 "skip the checkpoint check of block: #{} {}",
@@ -531,7 +545,7 @@ impl Generator {
             let now = Instant::now();
             if let Err(err) = self.check_transaction_signature(&state, &tx) {
                 let target = build_challenge_target(
-                    block_hash.into(),
+                    block_hash,
                     ChallengeTargetType::TxSignature,
                     tx_index as u32,
                 );
@@ -553,7 +567,7 @@ impl Generator {
             if actual_nonce != expected_nonce {
                 return ApplyBlockResult::Challenge {
                     target: build_challenge_target(
-                        block_hash.into(),
+                        block_hash,
                         ChallengeTargetType::TxExecution,
                         tx_index as u32,
                     ),
@@ -581,7 +595,7 @@ impl Generator {
                 Ok(run_result) => run_result,
                 Err(err) => {
                     let target = build_challenge_target(
-                        block_hash.into(),
+                        block_hash,
                         ChallengeTargetType::TxExecution,
                         tx_index as u32,
                     );
@@ -636,7 +650,7 @@ impl Generator {
 
                     if !skip_checkpoint_check && block_checkpoint != expected_checkpoint {
                         let target = build_challenge_target(
-                            block_hash.into(),
+                            block_hash,
                             ChallengeTargetType::TxExecution,
                             tx_index as u32,
                         );
@@ -657,7 +671,7 @@ impl Generator {
                     Err(err) => return ApplyBlockResult::Error(err.into()),
                 };
                 let tx_receipt =
-                    TxReceipt::build_receipt(tx.witness_hash().into(), run_result, post_state);
+                    TxReceipt::build_receipt(tx.witness_hash(), run_result, post_state);
 
                 tx_receipts.push(tx_receipt);
                 offchain_used_cycles = offchain_used_cycles.saturating_add(used_cycles);
@@ -671,12 +685,12 @@ impl Generator {
             assert_eq!(
                 state.calculate_root().expect("check post root"),
                 post_merkle_root,
-                "post account merkle root must be consistent"
+                "wrong block post root"
             );
             assert_eq!(
                 state.get_account_count().expect("check post count"),
                 post_merkle_count,
-                "post account merkle count must be consistent"
+                "wrong block post account count"
             );
         }
 
@@ -713,8 +727,7 @@ impl Generator {
                 if script.hash_type() == ScriptHashType::Type.into() {
                     let code_hash: [u8; 32] = script.code_hash().unpack();
                     log::debug!("load_backend by code_hash: {}", hex::encode(code_hash));
-                    self.backend_manage
-                        .get_backend(block_number, &code_hash.into())
+                    self.backend_manage.get_backend(block_number, &code_hash)
                 } else {
                     log::error!(
                         "Found a invalid account script which hash_type is data: {:?}",
diff --git a/crates/generator/src/genesis.rs b/crates/generator/src/genesis.rs
index 018900fa2..caa3e5707 100644
--- a/crates/generator/src/genesis.rs
+++ b/crates/generator/src/genesis.rs
@@ -3,11 +3,11 @@ use anyhow::{Context, Result};
 use gw_common::{
     blake2b::new_blake2b,
     builtins::{CKB_SUDT_ACCOUNT_ID, ETH_REGISTRY_ACCOUNT_ID, RESERVED_ACCOUNT_ID},
-    smt::{H256, SMT},
     state::State,
     CKB_SUDT_SCRIPT_ARGS,
 };
 use gw_config::GenesisConfig;
+use gw_smt::smt::{SMT, SMTH256};
 use gw_store::{
     smt::smt_store::SMTStateStore,
     state::{
@@ -23,6 +23,7 @@ use gw_traits::CodeStore;
 use gw_types::{
     bytes::Bytes,
     core::{ScriptHashType, Status},
+    h256::*,
     packed::{
         AccountMerkleState, BlockMerkleState, DepositInfoVec, FinalizedCustodianCapacity,
         GlobalState, L2Block, NumberHash, RawL2Block, Script, SubmitTransactions,
@@ -52,10 +53,7 @@ pub fn build_genesis_from_store(
     secp_data: Bytes,
 ) -> Result<(StoreTransaction, GenesisWithGlobalState)> {
     let rollup_context = RollupContext {
-        rollup_script_hash: {
-            let rollup_script_hash: [u8; 32] = config.rollup_type_hash.clone().into();
-            rollup_script_hash.into()
-        },
+        rollup_script_hash: config.rollup_type_hash.clone().into(),
         rollup_config: config.rollup_config.clone().into(),
         // it's safe to give a dummy `fork_config` for genesis, because
         // we won't use `fork_config` at this phase.
@@ -67,7 +65,7 @@ pub fn build_genesis_from_store(
 
     // build genesis state tree
     let mut tree = {
-        let smt = SMT::new(H256::zero(), SMTStateStore::new(&db));
+        let smt = SMT::new(SMTH256::zero(), SMTStateStore::new(&db));
         let inner = HistoryState::new(smt, 0, RWConfig::attach_block(0));
         StateDB::new(inner)
     };
@@ -88,8 +86,7 @@ pub fn build_genesis_from_store(
     );
 
     // setup CKB simple UDT contract
-    let ckb_sudt_script =
-        crate::sudt::build_l2_sudt_script(&rollup_context, &CKB_SUDT_SCRIPT_ARGS.into());
+    let ckb_sudt_script = crate::sudt::build_l2_sudt_script(&rollup_context, &CKB_SUDT_SCRIPT_ARGS);
     let ckb_sudt_id = tree.create_account_from_script(ckb_sudt_script)?;
     assert_eq!(
         ckb_sudt_id, CKB_SUDT_ACCOUNT_ID,
@@ -118,12 +115,12 @@ pub fn build_genesis_from_store(
         hasher.finalize(&mut hash);
         hash
     };
-    tree.insert_data(secp_data_hash.into(), secp_data);
+    tree.insert_data(secp_data_hash, secp_data);
     // insert data_hash into tree
-    tree.store_data_hash(secp_data_hash.into())?;
+    tree.store_data_hash(secp_data_hash)?;
 
     tree.finalise()?;
-    let prev_state_checkpoint: [u8; 32] = tree.calculate_state_checkpoint()?.into();
+    let prev_state_checkpoint: [u8; 32] = tree.calculate_state_checkpoint()?;
     let submit_txs = SubmitTransactions::new_builder()
         .prev_state_checkpoint(prev_state_checkpoint.pack())
         .build();
@@ -207,10 +204,7 @@ pub fn init_genesis(
     transaction_hash: &[u8; 32],
     secp_data: Bytes,
 ) -> Result<()> {
-    let rollup_script_hash: H256 = {
-        let rollup_script_hash: [u8; 32] = config.rollup_type_hash.clone().into();
-        rollup_script_hash.into()
-    };
+    let rollup_script_hash: H256 = config.rollup_type_hash.clone().into();
     if store.has_genesis()? {
         let chain_id = store.get_chain_id()?;
         if chain_id == rollup_script_hash {
diff --git a/crates/generator/src/sudt.rs b/crates/generator/src/sudt.rs
index 430281d4b..c17a30de4 100644
--- a/crates/generator/src/sudt.rs
+++ b/crates/generator/src/sudt.rs
@@ -1,5 +1,4 @@
-use gw_common::H256;
-use gw_types::{bytes::Bytes, core::ScriptHashType, packed::Script, prelude::*};
+use gw_types::{bytes::Bytes, core::ScriptHashType, h256::*, packed::Script, prelude::*};
 use gw_utils::RollupContext;
 
 pub fn build_l2_sudt_script(rollup_context: &RollupContext, l1_sudt_script_hash: &H256) -> Script {
diff --git a/crates/generator/src/syscalls/mod.rs b/crates/generator/src/syscalls/mod.rs
index b8b63d17b..10edefc6b 100644
--- a/crates/generator/src/syscalls/mod.rs
+++ b/crates/generator/src/syscalls/mod.rs
@@ -9,13 +9,11 @@ use ckb_vm::{
 };
 use gw_common::{
     blake2b::new_blake2b,
-    h256_ext::H256Ext,
     registry_address::RegistryAddress,
     state::{
         build_account_field_key, build_data_hash_key, build_script_hash_to_account_id_key, State,
         GW_ACCOUNT_NONCE_TYPE, GW_ACCOUNT_SCRIPT_HASH_TYPE,
     },
-    H256,
 };
 use gw_config::SyscallCyclesConfig;
 use gw_store::state::traits::JournalDB;
@@ -23,6 +21,7 @@ use gw_traits::{ChainView, CodeStore};
 use gw_types::{
     bytes::Bytes,
     core::ScriptHashType,
+    h256::*,
     offchain::CycleMeter,
     packed::{BlockInfo, LogItem, RawL2Transaction, Script},
     prelude::*,
@@ -116,7 +115,7 @@ fn load_data_h256<Mac: SupportMachine>(machine: &mut Mac, addr: u64) -> Result<H
             .load8(&Mac::REG::from_u64(addr).overflowing_add(&Mac::REG::from_u64(i as u64)))?
             .to_u8();
     }
-    Ok(H256::from(data))
+    Ok(data)
 }
 
 #[allow(clippy::needless_range_loop)]
@@ -239,10 +238,7 @@ impl<'a, 'b, S: State + CodeStore + JournalDB, C: ChainView, Mac: SupportMachine
                 let script_hash = script.hash();
 
                 // Return error if script_hash is exists
-                if self
-                    .get_account_id_by_script_hash(&script_hash.into())?
-                    .is_some()
-                {
+                if self.get_account_id_by_script_hash(&script_hash)?.is_some() {
                     machine.set_register(A0, Mac::REG::from_i8(GW_ERROR_DUPLICATED_SCRIPT_HASH));
                     return Ok(true);
                 }
@@ -318,17 +314,17 @@ impl<'a, 'b, S: State + CodeStore + JournalDB, C: ChainView, Mac: SupportMachine
                 self.state
                     .update_raw(
                         build_account_field_key(id, GW_ACCOUNT_SCRIPT_HASH_TYPE),
-                        script_hash.into(),
+                        script_hash,
                     )
                     .map_err(|err| {
                         VMError::Unexpected(format!("store script hash error: {}", err))
                     })?;
                 // script hash to id
                 let script_hash_to_id_value: H256 = {
-                    let mut buf: [u8; 32] = H256::from_u32(id).into();
+                    let mut buf: [u8; 32] = H256::from_u32(id);
                     // the first 4 bytes is id, set exists flag(fifth byte) to 1
                     buf[4] = 1;
-                    buf.into()
+                    buf
                 };
                 self.state
                     .update_raw(
@@ -339,7 +335,7 @@ impl<'a, 'b, S: State + CodeStore + JournalDB, C: ChainView, Mac: SupportMachine
                         VMError::Unexpected(format!("store script hash to id error: {}", err))
                     })?;
                 // insert script
-                self.state.insert_script(script_hash.into(), script);
+                self.state.insert_script(script_hash, script);
                 self.state
                     .set_account_count(id + 1)
                     .map_err(|err| VMError::Unexpected(format!("set acccount: {}", err)))?;
@@ -402,7 +398,7 @@ impl<'a, 'b, S: State + CodeStore + JournalDB, C: ChainView, Mac: SupportMachine
                     .update_raw(data_hash_key, H256::one())
                     .map_err(|err| VMError::Unexpected(format!("store data: {}", err)))?;
                 // write data
-                self.state.insert_data(data_hash.into(), data.into());
+                self.state.insert_data(data_hash, data.into());
                 machine.set_register(A0, Mac::REG::from_u8(SUCCESS));
                 Ok(true)
             }
diff --git a/crates/generator/src/tests/dummy_state.rs b/crates/generator/src/tests/dummy_state.rs
index f49c92056..cbe3f2f46 100644
--- a/crates/generator/src/tests/dummy_state.rs
+++ b/crates/generator/src/tests/dummy_state.rs
@@ -1,8 +1,6 @@
 use ckb_vm::Bytes;
-use gw_common::{
-    blake2b::new_blake2b, h256_ext::H256Ext, registry_address::RegistryAddress, smt::SMT,
-    state::State, H256,
-};
+use gw_common::{blake2b::new_blake2b, registry_address::RegistryAddress, state::State};
+use gw_smt::smt::{SMT, SMTH256};
 use gw_store::{
     smt::smt_store::SMTStateStore,
     snapshot::StoreSnapshot,
@@ -14,6 +12,7 @@ use gw_store::{
 };
 use gw_traits::CodeStore;
 use gw_types::{
+    h256::*,
     packed::Script,
     prelude::{Builder, Entity, Pack},
     U256,
@@ -22,7 +21,7 @@ use gw_types::{
 use crate::{traits::StateExt, Error};
 
 fn new_state(store: StoreSnapshot) -> MemStateDB {
-    let smt = SMT::new(H256::zero(), SMTStateStore::new(MemStore::new(store)));
+    let smt = SMT::new(SMTH256::zero(), SMTStateStore::new(MemStore::new(store)));
     let inner = MemStateTree::new(smt, 0);
     MemStateDB::new(inner)
 }
@@ -46,7 +45,7 @@ fn test_account_with_duplicate_script() {
     );
 
     // create duplicate account
-    let err2 = tree.create_account(script.hash().into()).unwrap_err();
+    let err2 = tree.create_account(script.hash()).unwrap_err();
     assert_eq!(err2, gw_common::error::Error::DuplicatedScriptHash);
 }
 
@@ -69,13 +68,13 @@ fn test_query_account() {
         assert_eq!(id, expected_id as u32);
         assert_eq!(tree.get_account_count().unwrap(), (expected_id + 1) as u32);
         assert_eq!(
-            tree.get_account_id_by_script_hash(&script.hash().into())
+            tree.get_account_id_by_script_hash(&script.hash())
                 .unwrap()
                 .unwrap(),
             id
         );
-        assert_eq!(tree.get_script_hash(id).unwrap(), script.hash().into());
-        assert_eq!(&tree.get_script(&script.hash().into()).unwrap(), script);
+        assert_eq!(tree.get_script_hash(id).unwrap(), script.hash());
+        assert_eq!(&tree.get_script(&script.hash()).unwrap(), script);
     }
 }
 
@@ -185,7 +184,7 @@ fn test_data_hash() {
         let mut buf = [0u8; 32];
         hasher.update(&data);
         hasher.finalize(&mut buf);
-        buf.into()
+        buf
     };
     tree.insert_data(data_hash, data.to_vec().into());
     // query data
diff --git a/crates/generator/src/tests/genesis.rs b/crates/generator/src/tests/genesis.rs
index 28eaab6ff..eebb9a645 100644
--- a/crates/generator/src/tests/genesis.rs
+++ b/crates/generator/src/tests/genesis.rs
@@ -1,5 +1,5 @@
 use crate::genesis::{build_genesis, init_genesis};
-use gw_common::{sparse_merkle_tree::H256, state::State};
+use gw_common::state::State;
 use gw_config::GenesisConfig;
 use gw_store::{
     state::{history::history_state::RWConfig, BlockStateDB},
@@ -7,7 +7,7 @@ use gw_store::{
     Store,
 };
 use gw_traits::CodeStore;
-use gw_types::{bytes::Bytes, core::ScriptHashType, packed::RollupConfig, prelude::*};
+use gw_types::{bytes::Bytes, core::ScriptHashType, h256::*, packed::RollupConfig, prelude::*};
 use std::convert::TryInto;
 
 const GENESIS_BLOCK_HASH: [u8; 32] = [
@@ -40,7 +40,7 @@ fn test_init_genesis() {
     assert!(tree.get_account_count().unwrap() > 0);
 
     // check prev txs state
-    let prev_txs_state: [u8; 32] = tree.calculate_state_checkpoint().unwrap().into();
+    let prev_txs_state: [u8; 32] = tree.calculate_state_checkpoint().unwrap();
     let genesis_prev_state_checkpoint: [u8; 32] = {
         let txs = genesis.genesis.as_reader().raw().submit_transactions();
         txs.prev_state_checkpoint().unpack()
diff --git a/crates/generator/src/traits.rs b/crates/generator/src/traits.rs
index c4d1f3acc..d3e861538 100644
--- a/crates/generator/src/traits.rs
+++ b/crates/generator/src/traits.rs
@@ -3,12 +3,13 @@ use crate::sudt::build_l2_sudt_script;
 use gw_common::ckb_decimal::{CKBCapacity, CKB_DECIMAL_POW_EXP};
 use gw_common::registry::context::RegistryContext;
 use gw_common::registry_address::RegistryAddress;
-use gw_common::{builtins::CKB_SUDT_ACCOUNT_ID, state::State, CKB_SUDT_SCRIPT_ARGS, H256};
+use gw_common::{builtins::CKB_SUDT_ACCOUNT_ID, state::State, CKB_SUDT_SCRIPT_ARGS};
 use gw_store::state::traits::JournalDB;
 use gw_traits::CodeStore;
 use gw_types::U256;
 use gw_types::{
     core::ScriptHashType,
+    h256::*,
     packed::{AccountMerkleState, DepositRequest, Script, WithdrawalReceipt, WithdrawalRequest},
     prelude::*,
 };
@@ -47,8 +48,8 @@ impl<S: State + CodeStore + JournalDB> StateExt for S {
             return Err(AccountError::UnknownScript.into());
         }
         let script_hash = script.hash();
-        self.insert_script(script_hash.into(), script);
-        let id = self.create_account(script_hash.into())?;
+        self.insert_script(script_hash, script);
+        let id = self.create_account(script_hash)?;
         Ok(id)
     }
 
@@ -89,7 +90,7 @@ impl<S: State + CodeStore + JournalDB> StateExt for S {
         request: &DepositRequest,
     ) -> Result<(), Error> {
         // find or create user account
-        let account_script_hash: H256 = request.script().hash().into();
+        let account_script_hash: H256 = request.script().hash();
         // mint CKB
         let capacity: u64 = request.capacity().unpack();
         log::debug!("[generator] deposit capacity {}", capacity);
@@ -140,15 +141,15 @@ impl<S: State + CodeStore + JournalDB> StateExt for S {
         );
         let sudt_script_hash = request.sudt_script_hash().unpack();
         let amount = request.amount().unpack();
-        if sudt_script_hash != CKB_SUDT_SCRIPT_ARGS.into() {
+        if sudt_script_hash != CKB_SUDT_SCRIPT_ARGS {
             // find or create Simple UDT account
             let l2_sudt_script = build_l2_sudt_script(ctx, &sudt_script_hash);
             let l2_sudt_script_hash: [u8; 32] = l2_sudt_script.hash();
-            let sudt_id = match self.get_account_id_by_script_hash(&l2_sudt_script_hash.into())? {
+            let sudt_id = match self.get_account_id_by_script_hash(&l2_sudt_script_hash)? {
                 Some(id) => id,
                 None => {
-                    self.insert_script(l2_sudt_script_hash.into(), l2_sudt_script);
-                    self.create_account(l2_sudt_script_hash.into())?
+                    self.insert_script(l2_sudt_script_hash, l2_sudt_script);
+                    self.create_account(l2_sudt_script_hash)?
                 }
             };
             // prevent fake CKB SUDT, the caller should filter these invalid deposits
@@ -207,7 +208,7 @@ impl<S: State + CodeStore + JournalDB> StateExt for S {
             CKBCapacity::from_layer1(capacity).to_layer2(),
         )?;
         let sudt_id = self
-            .get_account_id_by_script_hash(&l2_sudt_script_hash.into())?
+            .get_account_id_by_script_hash(&l2_sudt_script_hash)?
             .ok_or(AccountError::UnknownSUDT)?;
         if sudt_id != CKB_SUDT_ACCOUNT_ID {
             // burn sudt
diff --git a/crates/generator/src/utils.rs b/crates/generator/src/utils.rs
index 2d0ec888b..0891ef561 100644
--- a/crates/generator/src/utils.rs
+++ b/crates/generator/src/utils.rs
@@ -1,13 +1,14 @@
 use std::convert::TryInto;
 
 use anyhow::{Context, Result};
-use gw_common::{builtins::CKB_SUDT_ACCOUNT_ID, state::State, H256};
+use gw_common::{builtins::CKB_SUDT_ACCOUNT_ID, state::State};
 use gw_config::BackendType;
 use gw_traits::CodeStore;
 use gw_types::core::Timepoint;
 use gw_types::{
     bytes::Bytes,
     core::{AllowedContractType, ScriptHashType},
+    h256::*,
     packed::{CellOutput, RawL2Transaction, Script, WithdrawalLockArgs, WithdrawalRequestExtra},
     prelude::*,
 };
@@ -49,7 +50,7 @@ pub fn build_withdrawal_cell_output(
     rollup_context: &RollupContext,
     req: &WithdrawalRequestExtra,
     block_hash: &H256,
-    block_timepoint: &Timepoint,
+    finalized_timepoint: &Timepoint,
     opt_asset_script: Option<Script>,
 ) -> Result<(CellOutput, Bytes), WithdrawalCellError> {
     let withdrawal_capacity: u64 = req.raw().capacity().unpack();
@@ -57,7 +58,7 @@ pub fn build_withdrawal_cell_output(
         let withdrawal_lock_args = WithdrawalLockArgs::new_builder()
             .account_script_hash(req.raw().account_script_hash())
             .withdrawal_block_hash(Into::<[u8; 32]>::into(*block_hash).pack())
-            .withdrawal_block_timepoint(block_timepoint.full_value().pack())
+            .withdrawal_finalized_timepoint(finalized_timepoint.full_value().pack())
             .owner_lock_hash(req.raw().owner_lock_hash())
             .build();
 
@@ -67,7 +68,7 @@ pub fn build_withdrawal_cell_output(
         let owner_lock = req.owner_lock();
         let owner_lock_hash: [u8; 32] = req.raw().owner_lock_hash().unpack();
         if owner_lock_hash != owner_lock.hash() {
-            return Err(WithdrawalCellError::OwnerLock(owner_lock_hash.into()));
+            return Err(WithdrawalCellError::OwnerLock(owner_lock_hash));
         }
         args.extend_from_slice(&(owner_lock.as_slice().len() as u32).to_be_bytes());
         args.extend_from_slice(owner_lock.as_slice());
@@ -131,7 +132,7 @@ pub fn get_polyjuice_creator_id<S: State + CodeStore>(
             .hash_type(ScriptHashType::Type.into())
             .args(args.pack())
             .build();
-        let script_hash = script.hash().into();
+        let script_hash = script.hash();
         let polyjuice_creator_id = state.get_account_id_by_script_hash(&script_hash)?;
         Ok(polyjuice_creator_id)
     } else {
@@ -141,10 +142,9 @@ pub fn get_polyjuice_creator_id<S: State + CodeStore>(
 
 #[cfg(test)]
 mod test {
-    use gw_common::h256_ext::H256Ext;
-    use gw_common::H256;
     use gw_types::bytes::Bytes;
     use gw_types::core::{ScriptHashType, Timepoint};
+    use gw_types::h256::*;
     use gw_types::packed::{
         RawWithdrawalRequest, RollupConfig, Script, WithdrawalRequest, WithdrawalRequestExtra,
     };
@@ -234,7 +234,7 @@ mod test {
         );
         assert_eq!(lock_args.withdrawal_block_hash(), block_hash.pack());
         assert_eq!(
-            lock_args.withdrawal_block_timepoint().unpack(),
+            lock_args.withdrawal_finalized_timepoint().unpack(),
             block_timepoint.full_value()
         );
         assert_eq!(lock_args.owner_lock_hash(), owner_lock.hash().pack());
diff --git a/crates/generator/src/verification/withdrawal.rs b/crates/generator/src/verification/withdrawal.rs
index 246900105..ef0c4abb8 100644
--- a/crates/generator/src/verification/withdrawal.rs
+++ b/crates/generator/src/verification/withdrawal.rs
@@ -1,10 +1,9 @@
-use gw_common::{
-    builtins::CKB_SUDT_ACCOUNT_ID, ckb_decimal::CKBCapacity, h256_ext::H256Ext, state::State, H256,
-};
+use gw_common::{builtins::CKB_SUDT_ACCOUNT_ID, ckb_decimal::CKBCapacity, state::State};
 use gw_config::ForkConfig;
 use gw_traits::CodeStore;
 use gw_types::{
     core::Timepoint,
+    h256::*,
     packed::{Script, WithdrawalRequestExtra},
     prelude::*,
     U256,
@@ -111,7 +110,7 @@ impl<'a, S: State + CodeStore> WithdrawalVerifier<'a, S> {
             build_l2_sudt_script(self.rollup_context, &sudt_script_hash).hash();
         let sudt_id = self
             .state
-            .get_account_id_by_script_hash(&l2_sudt_script_hash.into())?
+            .get_account_id_by_script_hash(&l2_sudt_script_hash)?
             .ok_or(AccountError::UnknownSUDT)?;
         // The sUDT id must not be equals to the CKB sUDT id if amount isn't 0
         if sudt_id != CKB_SUDT_ACCOUNT_ID {
diff --git a/crates/godwoken-bin/Cargo.toml b/crates/godwoken-bin/Cargo.toml
index 198a46928..9f4c6a655 100644
--- a/crates/godwoken-bin/Cargo.toml
+++ b/crates/godwoken-bin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "godwoken-bin"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 authors = ["Nervos Network"]
 edition = "2021"
 
@@ -14,14 +14,15 @@ indicatif = "0.16"
 gw-block-producer = { path = "../block-producer" }
 gw-chain = { path = "../chain" }
 gw-challenge = { path = "../challenge" }
-gw-common = { path = "../common" }
+gw-common = { path = "../../gwos/crates/common" }
+gw-smt = { path = "../smt" }
 gw-config = { path = "../config" }
 gw-db = { path = "../db" }
 gw-generator = { path = "../generator" }
 gw-jsonrpc-types = { path = "../jsonrpc-types" }
 gw-telemetry = { path = "../telemetry" }
 gw-store = { path = "../store" }
-gw-types = { path = "../types" }
+gw-types = { path = "../../gwos/crates/types" }
 gw-utils = { path = "../utils" }
 gw-version = { path = "../version" }
 gw-metrics = { path = "../metrics" }
@@ -39,7 +40,7 @@ tikv-jemallocator = { version = "0.4.0", features = ["unprefixed_malloc_on_suppo
 
 [features]
 profiling = ["tikv-jemallocator/profiling"]
-smt-trie = ["gw-common/smt-trie", "gw-db/smt-trie", "gw-store/smt-trie"]
+smt-trie = ["gw-smt/smt-trie", "gw-db/smt-trie", "gw-store/smt-trie"]
 
 [lib]
 path = "src/lib.rs"
diff --git a/crates/godwoken-bin/src/subcommand/db_block_validator.rs b/crates/godwoken-bin/src/subcommand/db_block_validator.rs
index 7b2ec11ba..6d8d866f0 100644
--- a/crates/godwoken-bin/src/subcommand/db_block_validator.rs
+++ b/crates/godwoken-bin/src/subcommand/db_block_validator.rs
@@ -9,13 +9,13 @@ use gw_challenge::{
         OffChainMockContext,
     },
 };
-use gw_common::H256;
 use gw_config::{Config, DBBlockValidatorConfig, DebugConfig};
 use gw_generator::Generator;
 use gw_jsonrpc_types::godwoken::ChallengeTargetType as JsonChallengeTargetType;
 use gw_store::{traits::chain_store::ChainStore, Store};
 use gw_types::{
     core::{ChallengeTargetType, Status},
+    h256::*,
     packed::{ChallengeTarget, GlobalState, L2Block},
     prelude::{Builder, Entity, Pack, Unpack},
 };
@@ -141,7 +141,7 @@ impl DBBlockCancelChallengeValidator {
     }
 
     fn verify_withdrawals(&self, global_state: GlobalState, block: &L2Block) -> Result<()> {
-        let block_hash: H256 = block.hash().into();
+        let block_hash: H256 = block.hash();
         let block_number: u64 = block.raw().number().unpack();
 
         let verify_withdrawal = |idx| -> Result<()> {
@@ -169,7 +169,7 @@ impl DBBlockCancelChallengeValidator {
                 block_number,
                 target_type: ChallengeTargetType::Withdrawal,
                 target_index: idx,
-                target_hash: withdrawal.hash().into(),
+                target_hash: withdrawal.hash(),
             };
 
             let target = build_challenge_target(block_hash, idx, ChallengeTargetType::Withdrawal);
@@ -186,7 +186,7 @@ impl DBBlockCancelChallengeValidator {
     }
 
     fn verify_txs(&self, global_state: GlobalState, block: &L2Block) -> Result<()> {
-        let block_hash: H256 = block.hash().into();
+        let block_hash: H256 = block.hash();
         let block_number: u64 = block.raw().number().unpack();
 
         let verify_tx =
@@ -227,7 +227,7 @@ impl DBBlockCancelChallengeValidator {
                 }
 
                 let tx = block.transactions().get(idx as usize).unwrap();
-                let tx_hash = tx.hash().into();
+                let tx_hash = tx.hash();
 
                 verify_tx(idx, tx_hash, ChallengeTargetType::TxSignature)?;
                 verify_tx(idx, tx_hash, ChallengeTargetType::TxExecution)?;
@@ -350,7 +350,7 @@ impl DumpContext {
             ChallengeTargetType::TxExecution => "tx-execution",
             ChallengeTargetType::Withdrawal => "withdrawal",
         };
-        let hash = ckb_types::H256(self.target_hash.into());
+        let hash = ckb_types::H256(self.target_hash);
         let strategy = match load_data_strategy {
             LoadDataStrategy::Witness => "with-witness-load-data",
             LoadDataStrategy::CellDep => "with-celldep-load-data",
diff --git a/crates/godwoken-bin/src/subcommand/import_block.rs b/crates/godwoken-bin/src/subcommand/import_block.rs
index e5251fbc0..f74b91034 100644
--- a/crates/godwoken-bin/src/subcommand/import_block.rs
+++ b/crates/godwoken-bin/src/subcommand/import_block.rs
@@ -159,7 +159,7 @@ impl ImportBlock {
         let (new_block, _size) = block_reader
             .peek_block()?
             .ok_or_else(|| anyhow!("no new block"))?;
-        if new_block.parent_block_hash() != db_tip_block.hash().into() {
+        if new_block.parent_block_hash() != db_tip_block.hash() {
             bail!("diff parent block {}", db_tip_block_number);
         }
 
@@ -254,7 +254,7 @@ fn insert_block(
     check_block_post_state(&tx_db, block_number, &exported.post_global_state)?;
 
     if let Some(hash) = exported.submit_tx_hash {
-        tx_db.set_block_submit_tx_hash(block_number, &hash.into())?;
+        tx_db.set_block_submit_tx_hash(block_number, &hash)?;
         *last_submitted_block = Some(block_number);
     };
     chain.calculate_and_store_finalized_custodians(&tx_db, block_number)?;
diff --git a/crates/godwoken-bin/src/subcommand/migrate/smt_trie.rs b/crates/godwoken-bin/src/subcommand/migrate/smt_trie.rs
index da6ac63dc..3bd2950fc 100644
--- a/crates/godwoken-bin/src/subcommand/migrate/smt_trie.rs
+++ b/crates/godwoken-bin/src/subcommand/migrate/smt_trie.rs
@@ -11,6 +11,7 @@ use gw_store::{
     traits::{chain_store::ChainStore, kv_store::KVStoreWrite},
     Store,
 };
+use gw_types::h256::*;
 
 pub struct SMTTrieMigration;
 
@@ -81,7 +82,8 @@ impl Migration for SMTTrieMigration {
                     )
                     .context("update block_smt")?;
             }
-            ensure!(tx.get_block_smt_root().unwrap() == *block_smt.root());
+            let block_smt_root: H256 = tx.get_block_smt_root().unwrap();
+            ensure!(block_smt_root == H256::from(*block_smt.root()));
             tx.commit().context("commit block smt")?;
         }
 
@@ -101,7 +103,9 @@ impl Migration for SMTTrieMigration {
                     )
                     .context("update reverted_block_smt")?;
             }
-            ensure!(tx.get_reverted_block_smt_root().unwrap() == *reverted_block_smt.root());
+            ensure!(
+                tx.get_reverted_block_smt_root().unwrap() == H256::from(*reverted_block_smt.root())
+            );
             tx.commit().context("commit reverted_block_smt")?;
         }
 
diff --git a/crates/jsonrpc-types/Cargo.toml b/crates/jsonrpc-types/Cargo.toml
index 301f8ba46..e055d979f 100644
--- a/crates/jsonrpc-types/Cargo.toml
+++ b/crates/jsonrpc-types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-jsonrpc-types"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 
@@ -9,8 +9,8 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
 faster-hex = "0.4"
-gw-types = { path = "../types" }
-gw-common = { path = "../common" }
+gw-types = { path = "../../gwos/crates/types" }
+gw-common = { path = "../../gwos/crates/common" }
 ckb-jsonrpc-types = "0.105.1"
 ckb-fixed-hash = "0.105.1"
 anyhow = "1.0"
diff --git a/crates/jsonrpc-types/src/godwoken.rs b/crates/jsonrpc-types/src/godwoken.rs
index 1821b9899..41593a6a4 100644
--- a/crates/jsonrpc-types/src/godwoken.rs
+++ b/crates/jsonrpc-types/src/godwoken.rs
@@ -953,7 +953,6 @@ pub struct L2BlockCommittedInfo {
 pub enum AllowedEoaType {
     Unknown,
     Eth,
-    Tron,
 }
 
 impl From<AllowedEoaType> for packed::Byte {
@@ -961,7 +960,6 @@ impl From<AllowedEoaType> for packed::Byte {
         match json {
             AllowedEoaType::Unknown => packed::Byte::new(0),
             AllowedEoaType::Eth => packed::Byte::new(1),
-            AllowedEoaType::Tron => packed::Byte::new(2),
         }
     }
 }
@@ -973,7 +971,6 @@ impl TryFrom<packed::Byte> for AllowedEoaType {
         match u8::from(v) {
             0 => Ok(AllowedEoaType::Unknown),
             1 => Ok(AllowedEoaType::Eth),
-            2 => Ok(AllowedEoaType::Tron),
             _ => Err(anyhow!("invalid allowed eoa type {}", v)),
         }
     }
@@ -1374,12 +1371,12 @@ pub struct WithdrawalLockArgs {
     // block timestamp.
 
     // Before switching to v2, `withdrawal_block_number` should be `Some(block_number)` and
-    // `withdrawal_block_timestamp` should be `None`; afterwards, `withdrawal_block_number` will
-    // become `None` and `withdrawal_block_timestamp` will become `Some(block_timestamp)`.
+    // `withdrawal_finalized_timestamp` should be `None`; afterwards, `withdrawal_block_number` will
+    // become `None` and `withdrawal_finalized_timestamp` will become `Some(finalized_timestamp)`.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub withdrawal_block_number: Option<Uint64>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub withdrawal_block_timestamp: Option<Uint64>,
+    pub withdrawal_finalized_timestamp: Option<Uint64>,
 
     // layer1 lock to withdraw after challenge period
     pub owner_lock_hash: H256,
@@ -1393,26 +1390,26 @@ impl TryFrom<WithdrawalLockArgs> for packed::WithdrawalLockArgs {
             account_script_hash,
             withdrawal_block_hash,
             withdrawal_block_number,
-            withdrawal_block_timestamp,
+            withdrawal_finalized_timestamp,
             owner_lock_hash,
         } = json;
-        let withdrawal_block_timepoint = match (withdrawal_block_number, withdrawal_block_timestamp)
-        {
-            (Some(block_number), None) => Timepoint::from_block_number(block_number.value()),
-            (None, Some(timestamp)) => Timepoint::from_timestamp(timestamp.value()),
-            (bn, bt) => {
-                return Err(anyhow!(
-                    "conflict withdrawal_block_number {:?} and withdrawal_block_timestamp {:?}",
+        let withdrawal_finalized_timepoint =
+            match (withdrawal_block_number, withdrawal_finalized_timestamp) {
+                (Some(block_number), None) => Timepoint::from_block_number(block_number.value()),
+                (None, Some(timestamp)) => Timepoint::from_timestamp(timestamp.value()),
+                (bn, bt) => {
+                    return Err(anyhow!(
+                    "conflict withdrawal_block_number {:?} and withdrawal_finalized_timestamp {:?}",
                     bn,
                     bt
                 ));
-            }
-        };
+                }
+            };
 
         Ok(packed::WithdrawalLockArgs::new_builder()
             .account_script_hash(account_script_hash.pack())
             .withdrawal_block_hash(withdrawal_block_hash.pack())
-            .withdrawal_block_timepoint(withdrawal_block_timepoint.full_value().pack())
+            .withdrawal_finalized_timepoint(withdrawal_finalized_timepoint.full_value().pack())
             .owner_lock_hash(owner_lock_hash.pack())
             .build())
     }
@@ -1420,19 +1417,19 @@ impl TryFrom<WithdrawalLockArgs> for packed::WithdrawalLockArgs {
 
 impl From<packed::WithdrawalLockArgs> for WithdrawalLockArgs {
     fn from(data: packed::WithdrawalLockArgs) -> WithdrawalLockArgs {
-        let withdrawal_block_timepoint =
-            Timepoint::from_full_value(data.withdrawal_block_timepoint().unpack());
-        let (withdrawal_block_number, withdrawal_block_timestamp) = match withdrawal_block_timepoint
-        {
-            Timepoint::BlockNumber(block_number) => (Some(block_number), None),
-            Timepoint::Timestamp(timestamp) => (None, Some(timestamp)),
-        };
+        let withdrawal_finalized_timepoint =
+            Timepoint::from_full_value(data.withdrawal_finalized_timepoint().unpack());
+        let (withdrawal_block_number, withdrawal_finalized_timestamp) =
+            match withdrawal_finalized_timepoint {
+                Timepoint::BlockNumber(block_number) => (Some(block_number), None),
+                Timepoint::Timestamp(timestamp) => (None, Some(timestamp)),
+            };
         Self {
             account_script_hash: data.account_script_hash().unpack(),
             owner_lock_hash: data.owner_lock_hash().unpack(),
             withdrawal_block_hash: data.withdrawal_block_hash().unpack(),
             withdrawal_block_number: withdrawal_block_number.map(Into::into),
-            withdrawal_block_timestamp: withdrawal_block_timestamp.map(Into::into),
+            withdrawal_finalized_timestamp: withdrawal_finalized_timestamp.map(Into::into),
         }
     }
 }
diff --git a/crates/mem-pool/Cargo.toml b/crates/mem-pool/Cargo.toml
index e65c2402d..838807447 100644
--- a/crates/mem-pool/Cargo.toml
+++ b/crates/mem-pool/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
 name = "gw-mem-pool"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-gw-types = { path = "../types" }
-gw-common = { path = "../common" }
+gw-types = { path = "../../gwos/crates/types" }
+gw-common = { path = "../../gwos/crates/common" }
 gw-challenge = { path = "../challenge" }
 gw-generator = { path = "../generator" }
 gw-store = { path = "../store" }
diff --git a/crates/mem-pool/src/account_creator.rs b/crates/mem-pool/src/account_creator.rs
index 89ea108bf..e9a81baf3 100644
--- a/crates/mem-pool/src/account_creator.rs
+++ b/crates/mem-pool/src/account_creator.rs
@@ -5,11 +5,11 @@ use gw_common::{
     ckb_decimal::CKBCapacity,
     registry_address::RegistryAddress,
     state::State,
-    H256,
 };
 use gw_generator::account_lock_manage::secp256k1::Secp256k1Eth;
 use gw_types::{
     core::{AllowedEoaType, ScriptHashType},
+    h256::*,
     packed::{
         BatchCreateEthAccounts, Fee, L2Transaction, LogItemReader, MetaContractArgs,
         RawL2Transaction, Script, ScriptVec,
@@ -103,7 +103,7 @@ impl AccountCreator {
 
         let creator_script_hash = {
             let s = creator_wallet.eth_lock_script(&rollup_script_hash, &eth_lock_code_hash)?;
-            s.hash().into()
+            s.hash()
         };
 
         let creator = Self {
@@ -191,7 +191,7 @@ impl AccountCreator {
             creator_registry_address,
             meta_contract_script_hash,
         )?;
-        let sign = self.creator_wallet.sign_message(signing_message.into())?;
+        let sign = self.creator_wallet.sign_message(signing_message)?;
 
         let tx = L2Transaction::new_builder()
             .raw(raw_l2tx)
diff --git a/crates/mem-pool/src/block_sync_server.rs b/crates/mem-pool/src/block_sync_server.rs
index 426df101b..eeb1e0e61 100644
--- a/crates/mem-pool/src/block_sync_server.rs
+++ b/crates/mem-pool/src/block_sync_server.rs
@@ -7,11 +7,11 @@ use std::{
 
 use bytes::Bytes;
 use futures::{StreamExt, TryStreamExt};
-use gw_common::H256;
 use gw_config::SyncServerConfig;
 use gw_p2p_network::{FnSpawn, P2P_SYNC_PROTOCOL, P2P_SYNC_PROTOCOL_NAME};
 use gw_telemetry::traits::{OpenTelemetrySpanExt, TraceContextExt};
 use gw_types::{
+    h256::*,
     packed::{
         self, BlockSync, BlockSyncUnion, Confirmed, Found, L2Transaction, LocalBlock, NextMemBlock,
         P2PSyncRequest, P2PSyncRequestReader, P2PSyncResponse, PushTransaction, Revert, Submitted,
@@ -56,7 +56,7 @@ impl BlockSyncServerState {
         self.buffer.insert(
             number,
             BlockMessages {
-                hash: hash.into(),
+                hash,
                 messages: vec![msg.clone()],
             },
         );
@@ -127,7 +127,7 @@ impl BlockSyncServerState {
         self.buffer.insert(
             number,
             BlockMessages {
-                hash: [0; 32].into(),
+                hash: [0; 32],
                 messages: vec![msg.clone()],
             },
         );
diff --git a/crates/mem-pool/src/custodian.rs b/crates/mem-pool/src/custodian.rs
index d9f298f69..735383af2 100644
--- a/crates/mem-pool/src/custodian.rs
+++ b/crates/mem-pool/src/custodian.rs
@@ -1,7 +1,7 @@
 use std::{collections::HashSet, time::Instant};
 
 use anyhow::{anyhow, bail, Result};
-use gw_common::{CKB_SUDT_SCRIPT_ARGS, H256};
+use gw_common::CKB_SUDT_SCRIPT_ARGS;
 use gw_rpc_client::{
     indexer_client::CKBIndexerClient,
     indexer_types::{Order, SearchKey, SearchKeyFilter},
@@ -13,6 +13,7 @@ use gw_types::offchain::CompatibleFinalizedTimepoint;
 use gw_types::{
     bytes::Bytes,
     core::ScriptHashType,
+    h256::*,
     offchain::{CellInfo, CollectedCustodianCells, DepositInfo, WithdrawalsAmount},
     packed::{
         CellOutput, CustodianLockArgs, CustodianLockArgsReader, DepositLockArgs, Script,
@@ -31,7 +32,7 @@ use crate::constants::MAX_CUSTODIANS;
 pub fn to_custodian_cell(
     rollup_context: &RollupContext,
     block_hash: &H256,
-    block_timepoint: &Timepoint,
+    finalized_timepoint: &Timepoint,
     deposit_info: &DepositInfo,
 ) -> Result<(CellOutput, Bytes), u128> {
     let lock_args: Bytes = {
@@ -42,7 +43,7 @@ pub fn to_custodian_cell(
 
         let custodian_lock_args = CustodianLockArgs::new_builder()
             .deposit_block_hash(Into::<[u8; 32]>::into(*block_hash).pack())
-            .deposit_block_timepoint(block_timepoint.full_value().pack())
+            .deposit_finalized_timepoint(finalized_timepoint.full_value().pack())
             .deposit_lock_args(deposit_lock_args)
             .build();
 
@@ -184,7 +185,7 @@ fn sum_change_capacity(
     withdrawals_amount: &WithdrawalsAmount,
 ) -> u128 {
     let to_change_capacity = |sudt_script_hash: &[u8; 32]| -> u128 {
-        match db.get_asset_script(&H256::from(*sudt_script_hash)) {
+        match db.get_asset_script(sudt_script_hash) {
             Ok(Some(script)) => {
                 let (change, _data) = generate_finalized_custodian(rollup_context, 1, script);
                 change.capacity().unpack() as u128
@@ -297,7 +298,7 @@ async fn query_finalized_custodian_cells(
             };
 
             if !compatible_finalized_timepoint.is_finalized(&Timepoint::from_full_value(
-                custodian_lock_args.deposit_block_timepoint().unpack(),
+                custodian_lock_args.deposit_finalized_timepoint().unpack(),
             )) {
                 continue;
             }
@@ -391,7 +392,7 @@ mod tests {
     #[tokio::test]
     async fn test_query_finalized_custodians() {
         let rollup_context = RollupContext {
-            rollup_script_hash: [1u8; 32].into(),
+            rollup_script_hash: [1u8; 32],
             rollup_config: RollupConfig::new_builder()
                 .custodian_script_type_hash([2u8; 32].pack())
                 .l1_sudt_script_type_hash([3u8; 32].pack())
@@ -463,7 +464,7 @@ mod tests {
     ) -> Vec<CellInfo> {
         let args = {
             let custodian_lock_args = CustodianLockArgs::new_builder()
-                .deposit_block_timepoint(last_finalized_timepoint.full_value().pack())
+                .deposit_finalized_timepoint(last_finalized_timepoint.full_value().pack())
                 .build();
 
             let mut args = rollup_context.rollup_script_hash.as_slice().to_vec();
diff --git a/crates/mem-pool/src/default_provider.rs b/crates/mem-pool/src/default_provider.rs
index a7f6035ba..d067dfc96 100644
--- a/crates/mem-pool/src/default_provider.rs
+++ b/crates/mem-pool/src/default_provider.rs
@@ -52,7 +52,7 @@ impl MemPoolProvider for DefaultMemPoolProvider {
         loop {
             l1_block_number = l1_block_number.saturating_sub(1);
             let parent_block_hash = match rpc_client.get_header_by_number(l1_block_number).await? {
-                Some(header) => header.inner.parent_hash.0.into(),
+                Some(header) => header.inner.parent_hash.0,
                 None => continue,
             };
             match rpc_client.get_block_median_time(parent_block_hash).await? {
diff --git a/crates/mem-pool/src/deposit.rs b/crates/mem-pool/src/deposit.rs
index 9e71bc7c1..e29b7c45b 100644
--- a/crates/mem-pool/src/deposit.rs
+++ b/crates/mem-pool/src/deposit.rs
@@ -1,10 +1,11 @@
 use anyhow::{anyhow, Result};
-use gw_common::{h256_ext::H256Ext, registry::context::RegistryContext, state::State, H256};
+use gw_common::{registry::context::RegistryContext, state::State};
 use gw_config::DepositTimeoutConfig;
 use gw_store::state::MemStateDB;
 use gw_types::core::Timepoint;
 use gw_types::{
-    bytes::Bytes, core::ScriptHashType, offchain::DepositInfo, packed::DepositLockArgs, prelude::*,
+    bytes::Bytes, core::ScriptHashType, h256::*, offchain::DepositInfo, packed::DepositLockArgs,
+    prelude::*,
 };
 use gw_utils::since::{LockValue, Since};
 use gw_utils::RollupContext;
diff --git a/crates/mem-pool/src/fee/queue.rs b/crates/mem-pool/src/fee/queue.rs
index b6f2c5fce..bb599ea86 100644
--- a/crates/mem-pool/src/fee/queue.rs
+++ b/crates/mem-pool/src/fee/queue.rs
@@ -188,7 +188,7 @@ impl<T: TelemetryContext> Default for FeeQueue<T> {
 
 #[cfg(test)]
 mod tests {
-    use gw_common::{h256_ext::H256Ext, state::State, H256};
+    use gw_common::state::State;
     use gw_config::GenesisConfig;
     use gw_generator::genesis::init_genesis;
     use gw_store::{
@@ -196,6 +196,7 @@ mod tests {
         traits::chain_store::ChainStore,
         Store,
     };
+    use gw_types::h256::*;
     use gw_types::{
         bytes::Bytes,
         packed::{AllowedTypeHash, L2Transaction, RawL2Transaction, RollupConfig},
@@ -869,10 +870,7 @@ mod tests {
             meta_contract_validator_type_hash: [100u8; 32].into(),
             eth_registry_validator_type_hash: [101u8; 32].into(),
             rollup_config: rollup_config.into(),
-            rollup_type_hash: {
-                let h: [u8; 32] = rollup_type_hash.into();
-                h.into()
-            },
+            rollup_type_hash: rollup_type_hash.into(),
             secp_data_dep: Default::default(),
         };
         init_genesis(store, &genesis_config, &[0u8; 32], Bytes::default()).unwrap();
diff --git a/crates/mem-pool/src/fee/types.rs b/crates/mem-pool/src/fee/types.rs
index 600cf354d..392a4015f 100644
--- a/crates/mem-pool/src/fee/types.rs
+++ b/crates/mem-pool/src/fee/types.rs
@@ -1,9 +1,9 @@
 use std::cmp::Ordering;
 
 use anyhow::{anyhow, ensure, Context, Result};
-use gw_common::H256;
 use gw_config::{BackendType, FeeConfig, GaslessTxSupportConfig};
 use gw_types::{
+    h256::*,
     packed::{
         ETHAddrRegArgs, ETHAddrRegArgsUnion, L2Transaction, MetaContractArgs,
         MetaContractArgsUnion, SUDTArgs, SUDTArgsUnion, WithdrawalRequestExtra,
@@ -50,10 +50,10 @@ impl FeeItem {
         match self {
             Self::Tx(tx) if self.kind() == FeeItemKind::PendingCreateSenderTx => {
                 let sig: gw_types::bytes::Bytes = tx.signature().unpack();
-                gw_common::blake2b::hash(&sig).into()
+                gw_common::blake2b::hash(&sig)
             }
-            Self::Tx(tx) => tx.hash().into(),
-            Self::Withdrawal(withdrawal) => withdrawal.hash().into(),
+            Self::Tx(tx) => tx.hash(),
+            Self::Withdrawal(withdrawal) => withdrawal.hash(),
         }
     }
 
diff --git a/crates/mem-pool/src/mem_block.rs b/crates/mem-pool/src/mem_block.rs
index 784495b19..e9b7fa16b 100644
--- a/crates/mem-pool/src/mem_block.rs
+++ b/crates/mem-pool/src/mem_block.rs
@@ -1,10 +1,9 @@
 use std::{collections::HashSet, time::Duration};
 
-use gw_common::{
-    merkle_utils::calculate_state_checkpoint, registry_address::RegistryAddress, H256,
-};
+use gw_common::{merkle_utils::calculate_state_checkpoint, registry_address::RegistryAddress};
 use gw_types::{
     bytes::Bytes,
+    h256::H256,
     offchain::{DepositInfo, FinalizedCustodianCapacity},
     packed::{self, AccountMerkleState, BlockInfo, L2Block},
     prelude::*,
@@ -552,7 +551,7 @@ pub enum MemBlockCmp {
 mod test {
     use gw_common::merkle_utils::calculate_state_checkpoint;
     use gw_common::registry_address::RegistryAddress;
-    use gw_common::H256;
+    use gw_types::h256::*;
     use gw_types::packed::{AccountMerkleState, BlockInfo};
     use gw_types::prelude::{Builder, Entity, Pack, Unpack};
 
@@ -637,7 +636,7 @@ mod test {
     }
 
     fn random_hash() -> H256 {
-        rand::random::<[u8; 32]>().into()
+        rand::random()
     }
 
     fn random_state() -> AccountMerkleState {
diff --git a/crates/mem-pool/src/pool.rs b/crates/mem-pool/src/pool.rs
index 87fbc6c29..2b501c6c3 100644
--- a/crates/mem-pool/src/pool.rs
+++ b/crates/mem-pool/src/pool.rs
@@ -11,7 +11,7 @@
 use anyhow::{anyhow, Context, Result};
 use gw_common::{
     builtins::CKB_SUDT_ACCOUNT_ID, ckb_decimal::CKBCapacity, registry_address::RegistryAddress,
-    state::State, H256,
+    state::State,
 };
 use gw_config::{MemBlockConfig, MemPoolConfig, NodeMode, SyscallCyclesConfig};
 use gw_dynamic_config::manager::DynamicConfigManager;
@@ -33,6 +33,7 @@ use gw_store::{
 use gw_traits::CodeStore;
 use gw_types::packed::GlobalState;
 use gw_types::{
+    h256::*,
     offchain::{DepositInfo, FinalizedCustodianCapacity},
     packed::{
         AccountMerkleState, BlockInfo, L2Block, L2Transaction, NextMemBlock, Script, TxReceipt,
@@ -147,10 +148,10 @@ impl MemPool {
             let db = &store.begin_transaction();
             let tip_block = db.get_last_valid_tip_block()?;
             let tip_global_state = db
-                .get_block_post_global_state(&tip_block.hash().into())?
+                .get_block_post_global_state(&tip_block.hash())?
                 .expect("tip block post global");
             (
-                tip_block.hash().into(),
+                tip_block.hash(),
                 tip_block.raw().number().unpack(),
                 tip_global_state,
             )
@@ -320,7 +321,7 @@ impl MemPool {
         tx: L2Transaction,
     ) -> Result<()> {
         // check duplication
-        let tx_hash: H256 = tx.raw().hash().into();
+        let tx_hash: H256 = tx.raw().hash();
         if self.mem_block.txs_set().contains(&tx_hash) {
             return Err(anyhow!("duplicated tx"));
         }
@@ -380,7 +381,7 @@ impl MemPool {
         withdrawal: WithdrawalRequestExtra,
     ) -> Result<()> {
         // check duplication
-        let withdrawal_hash: H256 = withdrawal.raw().hash().into();
+        let withdrawal_hash: H256 = withdrawal.raw().hash();
         if self.mem_block.withdrawals_set().contains(&withdrawal_hash) {
             return Err(anyhow!("duplicated withdrawal"));
         }
@@ -670,7 +671,7 @@ impl MemPool {
                         let withdrawal = rem.withdrawals().get(index).unwrap();
                         let withdrawal_extra = self
                             .store
-                            .get_withdrawal(&withdrawal.hash().into())?
+                            .get_withdrawal(&withdrawal.hash())?
                             .expect("get withdrawal");
                         discarded_withdrawals.push_front(withdrawal_extra);
                     }
@@ -873,7 +874,7 @@ impl MemPool {
             // drop txs if tx.nonce lower than nonce
             let deprecated_txs = list.remove_lower_nonce_txs(nonce);
             for tx in deprecated_txs {
-                let tx_hash = tx.hash().into();
+                let tx_hash = tx.hash();
                 db.remove_mem_pool_transaction(&tx_hash)?;
             }
             // Drop all withdrawals that are have no enough balance
@@ -891,7 +892,7 @@ impl MemPool {
                 );
                 let deprecated_withdrawals = list.remove_lower_nonce_withdrawals(nonce, capacity);
                 for withdrawal in deprecated_withdrawals {
-                    let withdrawal_hash: H256 = withdrawal.hash().into();
+                    let withdrawal_hash: H256 = withdrawal.hash();
                     db.remove_mem_pool_withdrawal(&withdrawal_hash)?;
                 }
             }
@@ -1069,7 +1070,7 @@ impl MemPool {
         let finalized_custodians = self.collect_finalized_custodian_capacity()?;
         let asset_scripts: HashMap<H256, Script> = {
             let sudt_value = finalized_custodians.sudt.values();
-            sudt_value.map(|(_, script)| (script.hash().into(), script.to_owned()))
+            sudt_value.map(|(_, script)| (script.hash(), script.to_owned()))
         }
         .collect();
         // verify the withdrawals
@@ -1091,9 +1092,10 @@ impl MemPool {
                 unused_withdrawals.push(withdrawal_hash);
                 continue;
             }
-            let asset_script = asset_scripts
-                .get(&withdrawal.raw().sudt_script_hash().unpack())
-                .cloned();
+            let asset_script = {
+                let script_hash: H256 = withdrawal.raw().sudt_script_hash().unpack();
+                asset_scripts.get(&script_hash).cloned()
+            };
             if let Err(err) = WithdrawalVerifier::new(
                 state,
                 self.generator.rollup_context(),
@@ -1132,7 +1134,7 @@ impl MemPool {
                     let post_state = state.calculate_merkle_state()?;
                     let touched_keys = state.state_tracker().unwrap().touched_keys();
 
-                    let withdrawal_hash = withdrawal.hash().into();
+                    let withdrawal_hash = withdrawal.hash();
 
                     // Add to pending list and db if the withdrawal isn't
                     // already in them. This can happen when the withdrawal is
@@ -1256,8 +1258,7 @@ impl MemPool {
         let merkle_state = state.calculate_merkle_state()?;
 
         // generate tx receipt
-        let tx_receipt =
-            TxReceipt::build_receipt(tx.witness_hash().into(), run_result, merkle_state);
+        let tx_receipt = TxReceipt::build_receipt(tx.witness_hash(), run_result, merkle_state);
 
         if let Some(ref sync_server) = self.sync_server {
             sync_server.lock().unwrap().publish_transaction(tx);
@@ -1434,7 +1435,7 @@ mod test {
 
     use gw_common::merkle_utils::calculate_state_checkpoint;
     use gw_common::registry_address::RegistryAddress;
-    use gw_common::H256;
+    use gw_types::h256::*;
     use gw_types::offchain::{DepositInfo, FinalizedCustodianCapacity};
     use gw_types::packed::{AccountMerkleState, BlockInfo, DepositRequest};
     use gw_types::prelude::{Builder, Entity, Pack, Unpack};
@@ -1665,7 +1666,7 @@ mod test {
     }
 
     fn random_hash() -> H256 {
-        rand::random::<[u8; 32]>().into()
+        rand::random()
     }
 
     fn random_state() -> AccountMerkleState {
diff --git a/crates/mem-pool/src/withdrawal.rs b/crates/mem-pool/src/withdrawal.rs
index 50f0404b9..45ad25fdd 100644
--- a/crates/mem-pool/src/withdrawal.rs
+++ b/crates/mem-pool/src/withdrawal.rs
@@ -1,14 +1,13 @@
 use anyhow::{anyhow, bail, Result};
-use gw_common::H256;
 use gw_generator::generator::WithdrawalCellError;
-use gw_types::core::Timepoint;
 use gw_types::{
     bytes::Bytes,
+    h256::*,
     offchain::FinalizedCustodianCapacity,
     packed::{CellOutput, L2Block, Script, WithdrawalRequest, WithdrawalRequestExtra},
     prelude::*,
 };
-use gw_utils::RollupContext;
+use gw_utils::{finalized_timepoint, RollupContext};
 use std::collections::HashMap;
 
 use crate::custodian::{
@@ -116,25 +115,18 @@ impl<'a> Generator<'a> {
             let sudt_custodian = self.sudt_custodians.get(&sudt_type_hash);
             sudt_custodian.map(|sudt| sudt.script.to_owned())
         };
-        let block_hash: H256 = block.hash().into();
-        let block_timepoint = {
-            let block_number = block.raw().number().unpack();
-            if self
-                .rollup_context
-                .fork_config
-                .use_timestamp_as_timepoint(block_number)
-            {
-                let block_timestamp = block.raw().timestamp().unpack();
-                Timepoint::from_timestamp(block_timestamp)
-            } else {
-                Timepoint::from_block_number(block_number)
-            }
-        };
+        let block_hash: H256 = block.hash();
+        let finalized_timepoint = finalized_timepoint(
+            &self.rollup_context.rollup_config,
+            &self.rollup_context.fork_config,
+            block.raw().number().unpack(),
+            block.raw().timestamp().unpack(),
+        );
         let output = match gw_generator::utils::build_withdrawal_cell_output(
             self.rollup_context,
             req_extra,
             &block_hash,
-            &block_timepoint,
+            &finalized_timepoint,
             sudt_script,
         ) {
             Ok(output) => output,
@@ -325,9 +317,8 @@ mod test {
     use std::collections::HashMap;
     use std::iter::FromIterator;
 
-    use gw_common::h256_ext::H256Ext;
-    use gw_common::H256;
     use gw_types::core::Timepoint;
+    use gw_types::h256::*;
     use gw_types::offchain::FinalizedCustodianCapacity;
     use gw_types::packed::{
         L2Block, RawWithdrawalRequest, RollupConfig, Script, WithdrawalRequest,
@@ -397,7 +388,7 @@ mod test {
         let (expected_output, expected_data) = gw_generator::utils::build_withdrawal_cell_output(
             &rollup_context,
             &req_extra,
-            &block.hash().into(),
+            &block.hash(),
             &block_timepoint,
             Some(sudt_script),
         )
diff --git a/crates/metrics/Cargo.toml b/crates/metrics/Cargo.toml
index 7e67987a0..405705829 100644
--- a/crates/metrics/Cargo.toml
+++ b/crates/metrics/Cargo.toml
@@ -1,15 +1,15 @@
 [package]
 name = "gw-metrics"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-gw-common = { path = "../common" }
+gw-common = { path = "../../gwos/crates/common" }
 gw-store = { path = "../store" }
 gw-telemetry = { path = "../telemetry" }
-gw-types = { path = "../types" }
+gw-types = { path = "../../gwos/crates/types" }
 gw-config = { path = "../config" }
 
 arc-swap = "1.5"
diff --git a/crates/metrics/src/custodian.rs b/crates/metrics/src/custodian.rs
index be1d6a59b..3f165e8c2 100644
--- a/crates/metrics/src/custodian.rs
+++ b/crates/metrics/src/custodian.rs
@@ -1,4 +1,4 @@
-use gw_common::{CKB_SUDT_SCRIPT_ARGS, H256};
+use gw_common::CKB_SUDT_SCRIPT_ARGS;
 use gw_store::{traits::chain_store::ChainStore, Store};
 use gw_telemetry::metric::{
     encoding::text::Encode, family::Family, gauge::Gauge, prometheus_client, registry::Registry,
@@ -48,11 +48,11 @@ impl CustodianMetrics {
 
         let cal = |balance: &u128, decimal| balance.saturating_div(10u128.pow(decimal)) as u64;
         for custodian in config.custodian_map.values() {
-            if custodian.type_hash == H256::from(CKB_SUDT_SCRIPT_ARGS) {
+            if custodian.type_hash == CKB_SUDT_SCRIPT_ARGS {
                 self.finalized(custodian, |g, d| g.set(cal(&(local.capacity as u128), d)));
                 continue;
             }
-            if let Some((balance, _)) = local.sudt.get::<[u8; 32]>(&custodian.type_hash.into()) {
+            if let Some((balance, _)) = local.sudt.get::<[u8; 32]>(&custodian.type_hash) {
                 self.finalized(custodian, |g, d| g.set(cal(balance, d)));
             }
         }
diff --git a/crates/metrics/src/lib.rs b/crates/metrics/src/lib.rs
index 9be04676e..63ee13137 100644
--- a/crates/metrics/src/lib.rs
+++ b/crates/metrics/src/lib.rs
@@ -20,8 +20,8 @@ use serde::Deserialize;
 use smol_str::SmolStr;
 use tracing::instrument;
 
-use gw_common::H256;
 use gw_telemetry::metric::{encoding, registry::Registry, Lazy};
+use gw_types::h256::*;
 
 // TODO: add to config.toml
 const ENV_METRIC_MONITOR_CUSTODIAN_ENABLE: &str = "METRIC_MONITOR_CUSTODIAN_ENABLE";
@@ -108,12 +108,12 @@ impl Config {
 
             let c = Custodian {
                 symbol: SmolStr::new_inline(&jc.symbol),
-                type_hash: H256::from(buf),
+                type_hash: buf,
                 decimal: jc.decimal,
             };
             tracing::info!("monitor add {}", c.symbol);
 
-            Ok((H256::from(buf), c))
+            Ok((buf, c))
         });
 
         Ok(to_custodian.collect::<Result<_, _>>()?)
diff --git a/crates/p2p-network/Cargo.toml b/crates/p2p-network/Cargo.toml
index 43e1ded12..328875326 100644
--- a/crates/p2p-network/Cargo.toml
+++ b/crates/p2p-network/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "gw-p2p-network"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-gw-types = { path = "../types" }
+gw-types = { path = "../../gwos/crates/types" }
 gw-config = { path = "../config" }
 gw-utils = { path = "../utils" }
 tokio = "1"
diff --git a/crates/polyjuice-sender-recover/Cargo.toml b/crates/polyjuice-sender-recover/Cargo.toml
index 62b49a431..80ff7b24b 100644
--- a/crates/polyjuice-sender-recover/Cargo.toml
+++ b/crates/polyjuice-sender-recover/Cargo.toml
@@ -1,16 +1,16 @@
 [package]
 name = "gw-polyjuice-sender-recover"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 anyhow = "1.0"
-gw-common = { path = "../common" }
+gw-common = { path = "../../gwos/crates/common" }
 gw-generator = { path = "../generator" }
 gw-traits = { path = "../traits" }
-gw-types = { path = "../types" }
+gw-types = { path = "../../gwos/crates/types" }
 gw-utils = { path = "../utils" }
 gw-store = { path = "../store" }
 log = "0.4"
diff --git a/crates/polyjuice-sender-recover/src/mem_execute_tx_state.rs b/crates/polyjuice-sender-recover/src/mem_execute_tx_state.rs
index cbae6af1c..d6c28876a 100644
--- a/crates/polyjuice-sender-recover/src/mem_execute_tx_state.rs
+++ b/crates/polyjuice-sender-recover/src/mem_execute_tx_state.rs
@@ -1,10 +1,10 @@
 use anyhow::Result;
 use gw_common::registry_address::RegistryAddress;
 use gw_common::state::State;
-use gw_common::H256;
 use gw_generator::traits::StateExt;
 use gw_store::state::traits::JournalDB;
 use gw_traits::CodeStore;
+use gw_types::h256::*;
 use gw_types::packed::Script;
 
 pub fn mock_account<S: State + CodeStore + JournalDB>(
@@ -12,7 +12,7 @@ pub fn mock_account<S: State + CodeStore + JournalDB>(
     registry_address: RegistryAddress,
     account_script: Script,
 ) -> Result<u32> {
-    let account_script_hash: H256 = account_script.hash().into();
+    let account_script_hash: H256 = account_script.hash();
     if let Some(account_id) = state.get_account_id_by_script_hash(&account_script_hash)? {
         return Ok(account_id);
     }
diff --git a/crates/polyjuice-sender-recover/src/recover/error.rs b/crates/polyjuice-sender-recover/src/recover/error.rs
index 537d652ab..b7a3caa17 100644
--- a/crates/polyjuice-sender-recover/src/recover/error.rs
+++ b/crates/polyjuice-sender-recover/src/recover/error.rs
@@ -1,4 +1,5 @@
-use gw_common::{registry_address::RegistryAddress, H256};
+use gw_common::registry_address::RegistryAddress;
+use gw_types::h256::*;
 use gw_types::prelude::Pack;
 
 #[derive(thiserror::Error, Debug)]
diff --git a/crates/polyjuice-sender-recover/src/recover/eth_account_creator.rs b/crates/polyjuice-sender-recover/src/recover/eth_account_creator.rs
index 6054113bc..aef4f4e4d 100644
--- a/crates/polyjuice-sender-recover/src/recover/eth_account_creator.rs
+++ b/crates/polyjuice-sender-recover/src/recover/eth_account_creator.rs
@@ -3,8 +3,8 @@
 use anyhow::{anyhow, bail, Result};
 use gw_common::builtins::{ETH_REGISTRY_ACCOUNT_ID, RESERVED_ACCOUNT_ID};
 use gw_common::state::State;
-use gw_common::H256;
 use gw_generator::account_lock_manage::secp256k1::Secp256k1Eth;
+use gw_types::h256::*;
 use gw_types::packed::{
     BatchCreateEthAccounts, Fee, L2Transaction, MetaContractArgs, RawL2Transaction, ScriptVec,
 };
@@ -30,7 +30,7 @@ impl EthAccountCreator {
         let creator_script_hash = {
             let script =
                 creator_wallet.eth_lock_script(&ctx.rollup_script_hash, &ctx.eth_lock_code_hash)?;
-            script.hash().into()
+            script.hash()
         };
 
         let creator = EthAccountCreator {
@@ -89,7 +89,7 @@ impl EthAccountCreator {
             creator_registry_address,
             meta_contract_script_hash,
         )?;
-        let sign = self.creator_wallet.sign_message(signing_message.into())?;
+        let sign = self.creator_wallet.sign_message(signing_message)?;
 
         let tx = L2Transaction::new_builder()
             .raw(raw_l2tx)
diff --git a/crates/polyjuice-sender-recover/src/recover/eth_recover.rs b/crates/polyjuice-sender-recover/src/recover/eth_recover.rs
index 5efe5e87f..2989c226a 100644
--- a/crates/polyjuice-sender-recover/src/recover/eth_recover.rs
+++ b/crates/polyjuice-sender-recover/src/recover/eth_recover.rs
@@ -1,15 +1,14 @@
 use std::collections::HashMap;
 
 use anyhow::{anyhow, bail, Result};
-use gw_common::{
-    builtins::CKB_SUDT_ACCOUNT_ID, registry_address::RegistryAddress, state::State, H256,
-};
+use gw_common::{builtins::CKB_SUDT_ACCOUNT_ID, registry_address::RegistryAddress, state::State};
 use gw_generator::{error::TransactionError, typed_transaction::types::TypedRawTransaction};
 use gw_store::state::{traits::JournalDB, MemStateDB};
 use gw_traits::CodeStore;
 use gw_types::{
     bytes::Bytes,
     core::{AllowedContractType, AllowedEoaType, ScriptHashType},
+    h256::*,
     packed::{L2Transaction, RawL2Transaction, Script},
     prelude::{Builder, Entity, Pack, Unpack},
 };
@@ -96,7 +95,7 @@ impl RecoveredSenders {
     pub fn get_account_id(&self, sig: &Bytes, state: &impl State) -> Result<u32> {
         let account_script_hash = match self.sig_senders.get(sig) {
             Some(PolyjuiceTxEthSender::Exist { account_id, .. }) => return Ok(*account_id),
-            Some(PolyjuiceTxEthSender::New { account_script, .. }) => account_script.hash().into(),
+            Some(PolyjuiceTxEthSender::New { account_script, .. }) => account_script.hash(),
             None => bail!("no sender recovered"),
         };
 
diff --git a/crates/polyjuice-sender-recover/src/recover/eth_sender.rs b/crates/polyjuice-sender-recover/src/recover/eth_sender.rs
index 8ce2faa8f..ddbbc0836 100644
--- a/crates/polyjuice-sender-recover/src/recover/eth_sender.rs
+++ b/crates/polyjuice-sender-recover/src/recover/eth_sender.rs
@@ -1,11 +1,12 @@
 use anyhow::anyhow;
 use gw_common::{
-    builtins::ETH_REGISTRY_ACCOUNT_ID, registry_address::RegistryAddress, state::State, H256,
+    builtins::ETH_REGISTRY_ACCOUNT_ID, registry_address::RegistryAddress, state::State,
 };
 use gw_generator::account_lock_manage::{secp256k1::Secp256k1Eth, LockAlgorithm};
 use gw_traits::CodeStore;
 use gw_types::{
     bytes::Bytes,
+    h256::*,
     packed::{L2Transaction, RawL2Transaction, Script},
     prelude::{Pack, Unpack},
 };
@@ -39,7 +40,7 @@ impl PolyjuiceTxEthSender {
         let account_script = ctx.to_account_script(&registry_address);
 
         match state.get_script_hash_by_registry_address(&registry_address)? {
-            Some(script_hash) if script_hash != account_script.hash().into() => {
+            Some(script_hash) if script_hash != account_script.hash() => {
                 Err(PolyjuiceTxSenderRecoverError::DifferentScript {
                     registry_address,
                     script_hash,
diff --git a/crates/replay-chain/Cargo.toml b/crates/replay-chain/Cargo.toml
index b8c0da019..8a4a34d9e 100644
--- a/crates/replay-chain/Cargo.toml
+++ b/crates/replay-chain/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-replay-chain"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -8,9 +8,9 @@ edition = "2018"
 [dependencies]
 gw-chain = { path = "../chain" }
 gw-challenge = { path = "../challenge" }
-gw-types = { path = "../types" }
+gw-types = { path = "../../gwos/crates/types" }
 gw-config = { path = "../config" }
-gw-common = { path = "../common" }
+gw-common = { path = "../../gwos/crates/common" }
 gw-generator = { path = "../generator" }
 gw-mem-pool = { path = "../mem-pool" }
 gw-store = { path = "../store" }
diff --git a/crates/replay-chain/src/replay.rs b/crates/replay-chain/src/replay.rs
index 587733091..e19650e80 100644
--- a/crates/replay-chain/src/replay.rs
+++ b/crates/replay-chain/src/replay.rs
@@ -2,7 +2,6 @@ use std::{convert::TryInto, time::Instant};
 
 use crate::setup::Context as ChainContext;
 use anyhow::{anyhow, Result};
-use gw_common::H256;
 use gw_store::{
     state::{history::history_state::RWConfig, BlockStateDB},
     traits::chain_store::ChainStore,
@@ -22,7 +21,7 @@ pub fn replay_chain(ctx: ChainContext) -> Result<()> {
     let tip = local_store.get_tip_block()?;
     let number = {
         let block_hash = from_store.get_block_hash_by_number(tip.raw().number().unpack())?;
-        assert_eq!(H256::from(tip.hash()), block_hash.unwrap());
+        assert_eq!(tip.hash(), block_hash.unwrap());
         tip.raw().number().unpack()
     };
 
@@ -56,7 +55,7 @@ pub fn replay_chain(ctx: ChainContext) -> Result<()> {
             .into_iter()
             .map(|withdrawal| {
                 from_store
-                    .get_withdrawal(&withdrawal.hash().into())
+                    .get_withdrawal(&withdrawal.hash())
                     .expect("query")
                     .expect("block deposit requests")
             })
diff --git a/crates/replay-chain/src/setup.rs b/crates/replay-chain/src/setup.rs
index 14d679bc6..ddb94a95c 100644
--- a/crates/replay-chain/src/setup.rs
+++ b/crates/replay-chain/src/setup.rs
@@ -53,16 +53,17 @@ pub async fn setup(args: SetupArgs) -> Result<Context> {
     let rollup_config: RollupConfig = config.genesis.rollup_config.clone().into();
     let rollup_context = RollupContext {
         rollup_config: rollup_config.clone(),
-        rollup_script_hash: {
-            let rollup_script_hash: [u8; 32] = config.genesis.rollup_type_hash.clone().into();
-            rollup_script_hash.into()
-        },
+        rollup_script_hash: config.genesis.rollup_type_hash.clone().into(),
         fork_config: config.fork.clone(),
     };
     let secp_data: Bytes = {
         let rpc_client = {
-            let indexer_client = CKBIndexerClient::with_url(&config.rpc_client.indexer_url)?;
             let ckb_client = CKBClient::with_url(&config.rpc_client.ckb_url)?;
+            let indexer_client = if let Some(ref indexer_url) = config.rpc_client.indexer_url {
+                CKBIndexerClient::with_url(indexer_url)?
+            } else {
+                CKBIndexerClient::new(ckb_client.client().clone(), false)
+            };
             let rollup_type_script =
                 ckb_types::packed::Script::new_unchecked(rollup_type_script.as_bytes());
             RPCClient::new(
@@ -75,7 +76,7 @@ pub async fn setup(args: SetupArgs) -> Result<Context> {
         let out_point = config.genesis.secp_data_dep.out_point.clone();
         rpc_client
             .ckb
-            .get_transaction(out_point.tx_hash.0.into())
+            .get_transaction(out_point.tx_hash.0)
             .await?
             .ok_or_else(|| anyhow!("can not found transaction: {:?}", out_point.tx_hash))?
             .raw()
diff --git a/crates/rpc-client/Cargo.toml b/crates/rpc-client/Cargo.toml
index 089f27a86..88c8575f1 100644
--- a/crates/rpc-client/Cargo.toml
+++ b/crates/rpc-client/Cargo.toml
@@ -1,15 +1,15 @@
 [package]
 name = "gw-rpc-client"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-gw-common = { path = "../common" }
+gw-common = { path = "../../gwos/crates/common" }
 gw-config = { path = "../config" }
-gw-types = { path = "../types" }
+gw-types = { path = "../../gwos/crates/types" }
 gw-jsonrpc-types = { path = "../jsonrpc-types" }
 faster-hex = "0.4"
 ckb-crypto = "0.105.1"
diff --git a/crates/rpc-client/src/ckb_client.rs b/crates/rpc-client/src/ckb_client.rs
index fa3ea693c..578c8fdb2 100644
--- a/crates/rpc-client/src/ckb_client.rs
+++ b/crates/rpc-client/src/ckb_client.rs
@@ -6,12 +6,11 @@ use crate::{
 };
 use anyhow::{anyhow, bail, Context, Result};
 use async_jsonrpc_client::{HttpClient, Params as ClientParams, Transport};
-use gw_common::H256;
 use gw_jsonrpc_types::{
     blockchain::CellDep,
     ckb_jsonrpc_types::{self, Either},
 };
-use gw_types::{offchain::TxStatus, packed::Transaction, prelude::*};
+use gw_types::{h256::H256, offchain::TxStatus, packed::Transaction, prelude::*};
 use serde::de::DeserializeOwned;
 use serde_json::json;
 use tracing::instrument;
@@ -33,7 +32,7 @@ impl CKBClient {
         Ok(Self::new(client))
     }
 
-    fn client(&self) -> &HttpClient {
+    pub fn client(&self) -> &HttpClient {
         &self.ckb_client
     }
 
@@ -63,7 +62,7 @@ impl CKBClient {
     pub async fn get_transaction_block_number(&self, tx_hash: H256) -> Result<Option<u64>> {
         match self.get_transaction_block_hash(tx_hash).await? {
             Some(block_hash) => {
-                let block = self.get_block(block_hash.into()).await?;
+                let block = self.get_block(block_hash).await?;
                 Ok(block.map(|b| b.header.inner.number.value()))
             }
             None => Ok(None),
diff --git a/crates/rpc-client/src/indexer_client.rs b/crates/rpc-client/src/indexer_client.rs
index 56e782805..7f250a9bc 100644
--- a/crates/rpc-client/src/indexer_client.rs
+++ b/crates/rpc-client/src/indexer_client.rs
@@ -11,29 +11,60 @@ use ckb_types::prelude::Entity;
 use gw_jsonrpc_types::ckb_jsonrpc_types::{JsonBytes, Uint32};
 use gw_types::core::Timepoint;
 use gw_types::offchain::{CompatibleFinalizedTimepoint, CustodianStat, SUDTStat};
-use gw_types::packed::CustodianLockArgs;
+use gw_types::packed::{CustodianLockArgs, NumberHash};
 use gw_types::{packed::Script, prelude::*};
 use serde::de::DeserializeOwned;
 use serde_json::json;
 use tracing::instrument;
 
 #[derive(Clone)]
-pub struct CKBIndexerClient(HttpClient);
+pub struct CKBIndexerClient {
+    client: HttpClient,
+    // True when using standalone CKB indexer, false when using the new built in CKB indexer.
+    is_standalone: bool,
+}
 
 impl CKBIndexerClient {
-    pub fn new(ckb_indexer_client: HttpClient) -> Self {
-        Self(ckb_indexer_client)
+    pub fn new(ckb_indexer_client: HttpClient, is_standalone: bool) -> Self {
+        Self {
+            client: ckb_indexer_client,
+            is_standalone,
+        }
+    }
+
+    /// Create a new CKBIndexerClient with ckb RPC url.
+    pub fn with_ckb_url(url: &str) -> Result<Self> {
+        let client = HttpClient::builder()
+            .timeout(DEFAULT_HTTP_TIMEOUT)
+            .build(url)?;
+        Ok(Self::new(client, false))
     }
 
+    /// Create a new CKBIndexerClient with standalone indexer url.
     pub fn with_url(url: &str) -> Result<Self> {
         let client = HttpClient::builder()
             .timeout(DEFAULT_HTTP_TIMEOUT)
             .build(url)?;
-        Ok(Self::new(client))
+        Ok(Self::new(client, true))
     }
 
     fn client(&self) -> &HttpClient {
-        &self.0
+        &self.client
+    }
+
+    #[instrument(skip_all)]
+    pub async fn get_tip(&self) -> Result<NumberHash> {
+        let number_hash: gw_jsonrpc_types::blockchain::NumberHash = self
+            .request(
+                if self.is_standalone {
+                    "get_tip"
+                } else {
+                    "get_indexer_tip"
+                },
+                None,
+            )
+            .await?;
+        Ok(number_hash.into())
     }
 
     #[instrument(skip_all, fields(method = method))]
@@ -145,7 +176,7 @@ impl CKBIndexerClient {
                     let args = cell.output.lock.args.into_bytes();
                     let args = CustodianLockArgs::from_slice(&args[32..]).unwrap();
                     compatible_finalized_timepoint.is_finalized(&Timepoint::from_full_value(
-                        args.deposit_block_timepoint().unpack(),
+                        args.deposit_finalized_timepoint().unpack(),
                     ))
                 };
                 if is_finalized {
diff --git a/crates/rpc-client/src/rpc_client.rs b/crates/rpc-client/src/rpc_client.rs
index d3c4e89bb..1e9195c32 100644
--- a/crates/rpc-client/src/rpc_client.rs
+++ b/crates/rpc-client/src/rpc_client.rs
@@ -8,12 +8,12 @@ use anyhow::{anyhow, Result};
 use async_jsonrpc_client::Params as ClientParams;
 use ckb_types::core::hardfork::HardForkSwitch;
 use ckb_types::prelude::Entity;
-use gw_common::H256;
 use gw_jsonrpc_types::ckb_jsonrpc_types::{self, BlockNumber, Consensus, Uint32};
 use gw_types::offchain::{CellStatus, CellWithStatus, CompatibleFinalizedTimepoint, DepositInfo};
 use gw_types::{
     bytes::Bytes,
     core::ScriptHashType,
+    h256::H256,
     offchain::CellInfo,
     packed::{
         Block, CellOutput, CustodianLockArgs, CustodianLockArgsReader, DepositLockArgs,
@@ -372,11 +372,8 @@ impl RPCClient {
         }))
     }
 
-    #[instrument(skip_all)]
     pub async fn get_tip(&self) -> Result<NumberHash> {
-        let number_hash: gw_jsonrpc_types::blockchain::NumberHash =
-            self.indexer.request("get_tip", None).await?;
-        Ok(number_hash.into())
+        self.indexer.get_tip().await
     }
 
     #[instrument(skip_all, fields(block_hash = %block_hash.pack()))]
@@ -1135,7 +1132,7 @@ impl RPCClient {
                     Err(_) => continue,
                 };
                 if !compatible_finalized_timepoint.is_finalized(&Timepoint::from_full_value(
-                    custodian_lock_args.deposit_block_timepoint().unpack(),
+                    custodian_lock_args.deposit_finalized_timepoint().unpack(),
                 )) {
                     continue;
                 }
@@ -1234,7 +1231,7 @@ impl RPCClient {
                 };
 
                 if !compatible_finalized_timepoint.is_finalized(&Timepoint::from_full_value(
-                    custodian_lock_args.deposit_block_timepoint().unpack(),
+                    custodian_lock_args.deposit_finalized_timepoint().unpack(),
                 )) {
                     continue;
                 }
diff --git a/crates/rpc-client/src/utils.rs b/crates/rpc-client/src/utils.rs
index 00e35b9d2..367081863 100644
--- a/crates/rpc-client/src/utils.rs
+++ b/crates/rpc-client/src/utils.rs
@@ -1,7 +1,7 @@
 use std::time::Duration;
 
 use async_jsonrpc_client::Output;
-use gw_common::H256;
+use gw_types::h256::H256;
 use serde::de::DeserializeOwned;
 use serde_json::from_value;
 
@@ -21,13 +21,11 @@ lazy_static::lazy_static! {
 pub(crate) type JsonH256 = ckb_fixed_hash::H256;
 
 pub(crate) fn to_h256(v: JsonH256) -> H256 {
-    let h: [u8; 32] = v.into();
-    h.into()
+    v.into()
 }
 
 pub(crate) fn to_jsonh256(v: H256) -> JsonH256 {
-    let h: [u8; 32] = v.into();
-    h.into()
+    v.into()
 }
 
 pub(crate) fn to_result<T: DeserializeOwned>(output: Output) -> anyhow::Result<T> {
diff --git a/crates/rpc-client/src/withdrawal.rs b/crates/rpc-client/src/withdrawal.rs
index c0dd144fd..9ae9442c2 100644
--- a/crates/rpc-client/src/withdrawal.rs
+++ b/crates/rpc-client/src/withdrawal.rs
@@ -51,7 +51,7 @@ fn verify_finalized_owner_lock(
     };
 
     if !compatible_finalized_timepoint.is_finalized(&Timepoint::from_full_value(
-        lock_args.withdrawal_block_timepoint().unpack(),
+        lock_args.withdrawal_finalized_timepoint().unpack(),
     )) {
         bail!("unfinalized withdrawal");
     }
@@ -77,9 +77,8 @@ fn verify_finalized_owner_lock(
 
 #[cfg(test)]
 mod test {
-    use gw_common::h256_ext::H256Ext;
-    use gw_common::H256;
     use gw_types::core::{ScriptHashType, Timepoint};
+    use gw_types::h256::{H256Ext, H256};
     use gw_types::offchain::{CellInfo, CompatibleFinalizedTimepoint};
     use gw_types::packed::{CellOutput, Script, WithdrawalLockArgs};
     use gw_types::prelude::{Builder, Entity, Pack};
@@ -102,7 +101,7 @@ mod test {
             CompatibleFinalizedTimepoint::from_block_number(finalized_block_number, 0);
         let lock_args = WithdrawalLockArgs::new_builder()
             .owner_lock_hash(owner_lock.hash().pack())
-            .withdrawal_block_timepoint(last_finalized_timepoint.full_value().pack())
+            .withdrawal_finalized_timepoint(last_finalized_timepoint.full_value().pack())
             .build();
 
         let mut args = rollup_type_hash.to_vec();
@@ -138,7 +137,7 @@ mod test {
         let err_lock_args = lock_args
             .clone()
             .as_builder()
-            .withdrawal_block_timepoint((last_finalized_timepoint.full_value() + 1).pack())
+            .withdrawal_finalized_timepoint((last_finalized_timepoint.full_value() + 1).pack())
             .build();
 
         let mut args = rollup_type_hash.to_vec();
@@ -220,7 +219,7 @@ mod test {
         let last_finalized_timepoint = Timepoint::from_block_number(100);
         let lock_args = WithdrawalLockArgs::new_builder()
             .owner_lock_hash(owner_lock.hash().pack())
-            .withdrawal_block_timepoint(last_finalized_timepoint.full_value().pack())
+            .withdrawal_finalized_timepoint(last_finalized_timepoint.full_value().pack())
             .build();
 
         let mut args = rollup_type_hash.to_vec();
diff --git a/crates/rpc-server/Cargo.toml b/crates/rpc-server/Cargo.toml
index b96cc1f6c..e9d5b390d 100644
--- a/crates/rpc-server/Cargo.toml
+++ b/crates/rpc-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-rpc-server"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 authors = ["jjy <jjyruby@gmail.com>"]
 edition = "2018"
 
@@ -8,11 +8,12 @@ edition = "2018"
 
 [dependencies]
 gw-challenge = { path = "../challenge" }
-gw-common = { path = "../common" }
+gw-common = { path = "../../gwos/crates/common" }
+gw-smt = { path = "../smt" }
 gw-config = { path = "../config" }
 gw-chain = { path = "../chain" }
 gw-db = { path = "../db" }
-gw-types = { path = "../types" }
+gw-types = { path = "../../gwos/crates/types" }
 gw-store = { path = "../store" }
 gw-traits = { path = "../traits" }
 gw-generator = { path = "../generator" }
diff --git a/crates/rpc-server/src/in_queue_request_map.rs b/crates/rpc-server/src/in_queue_request_map.rs
index 0cc2aa1e3..4f2521f2b 100644
--- a/crates/rpc-server/src/in_queue_request_map.rs
+++ b/crates/rpc-server/src/in_queue_request_map.rs
@@ -1,7 +1,7 @@
 use std::sync::{Arc, RwLock};
 use std::{collections::HashMap, sync::Weak};
 
-use gw_common::H256;
+use gw_types::h256::*;
 use gw_types::packed::{L2Transaction, WithdrawalRequestExtra};
 
 use crate::registry::Request;
diff --git a/crates/rpc-server/src/registry.rs b/crates/rpc-server/src/registry.rs
index ce71b1c74..997deec26 100644
--- a/crates/rpc-server/src/registry.rs
+++ b/crates/rpc-server/src/registry.rs
@@ -3,7 +3,7 @@ use async_trait::async_trait;
 use ckb_types::prelude::{Builder, Entity};
 use gw_common::blake2b::new_blake2b;
 use gw_common::builtins::{CKB_SUDT_ACCOUNT_ID, ETH_REGISTRY_ACCOUNT_ID};
-use gw_common::{state::State, H256};
+use gw_common::state::State;
 use gw_config::{
     BackendForkConfig, ChainConfig, ConsensusConfig, FeeConfig, GaslessTxSupportConfig,
     MemPoolConfig, NodeMode, RPCMethods, RPCRateLimit, RPCServerConfig, SyscallCyclesConfig,
@@ -46,6 +46,7 @@ use gw_traits::CodeStore;
 use gw_types::packed::RawL2Transaction;
 use gw_types::{
     bytes::Bytes,
+    h256::*,
     packed::{self, BlockInfo, Byte32, L2Transaction, RollupConfig, WithdrawalRequestExtra},
     prelude::*,
     U256,
@@ -918,7 +919,7 @@ async fn get_block_committed_info(
                 .await?;
             if let Some(block_hash) = opt_block_hash {
                 let number = rpc_client
-                    .get_header(block_hash.into())
+                    .get_header(block_hash)
                     .await?
                     .context("get block header")?
                     .inner
@@ -954,12 +955,12 @@ async fn get_block(
 
     // check block status
     let mut status = L2BlockStatus::Unfinalized;
-    if !db.reverted_block_smt()?.get(&block_hash)?.is_zero() {
+    if !db.reverted_block_smt()?.get(&block_hash.into())?.is_zero() {
         // block is reverted
         status = L2BlockStatus::Reverted;
     } else {
         // return None if block is not on the main chain
-        if db.block_smt()?.get(&block.smt_key().into())? != block_hash {
+        if H256::from(db.block_smt()?.get(&block.smt_key().into())?) != block_hash {
             return Ok(None);
         }
 
@@ -1178,7 +1179,7 @@ async fn execute_l2transaction(
 
     if run_result.exit_code != 0 {
         let receipt = gw_types::offchain::ErrorTxReceipt {
-            tx_hash: tx_hash.into(),
+            tx_hash,
             block_number: number,
             return_data: run_result.return_data,
             last_log: run_result.logs.pop(),
@@ -1256,7 +1257,7 @@ async fn execute_raw_l2transaction(
     };
 
     let execute_l2tx_max_cycles = mem_pool_config.execute_l2tx_max_cycles;
-    let tx_hash: H256 = raw_l2tx.hash().into();
+    let tx_hash: H256 = raw_l2tx.hash();
     let block_number: u64 = block_info.number().unpack();
     let mut cycles_pool = CyclesPool::new(
         ctx.mem_pool_config.mem_block.max_cycles_limit,
@@ -1379,7 +1380,7 @@ async fn submit_l2transaction(
 ) -> Result<Option<JsonH256>, RpcError> {
     let l2tx_bytes = l2tx.into_bytes();
     let tx = packed::L2Transaction::from_slice(&l2tx_bytes)?;
-    let tx_hash: H256 = tx.hash().into();
+    let tx_hash: H256 = tx.hash();
 
     let sender_id: u32 = tx.raw().from_id().unpack();
     let eth_recover = &ctx.polyjuice_sender_recover.eth;
@@ -1394,7 +1395,7 @@ async fn submit_l2transaction(
     let tx_hash_json = if 0 == sender_id {
         None
     } else {
-        Some(to_jsonh256(tx.hash().into()))
+        Some(to_jsonh256(tx.hash()))
     };
 
     // check rate limit
@@ -1491,7 +1492,7 @@ async fn submit_l2transaction(
             hasher.update(&sig);
             let mut hash = [0u8; 32];
             hasher.finalize(&mut hash);
-            H256::from(hash)
+            hash
         }
     };
     let request = Request::Tx(tx);
@@ -1576,7 +1577,7 @@ async fn submit_withdrawal_request(
     if let Some(handle) = in_queue_request_map
         .as_ref()
         .expect("in_queue_request_map")
-        .insert(withdrawal_hash.into(), request.clone())
+        .insert(withdrawal_hash, request.clone())
     {
         // Send if the request wasn't already in the map.
         let in_queue_span = tracing::info_span!("submit_queue.send");
@@ -1894,7 +1895,7 @@ async fn compute_l2_sudt_script_hash(
 ) -> Result<JsonH256> {
     let l2_sudt_script =
         build_l2_sudt_script(generator.rollup_context(), &to_h256(l1_sudt_script_hash));
-    Ok(to_jsonh256(l2_sudt_script.hash().into()))
+    Ok(to_jsonh256(l2_sudt_script.hash()))
 }
 
 fn get_backend_info(generator: Arc<Generator>) -> Vec<BackendInfo> {
@@ -1905,9 +1906,9 @@ fn get_backend_info(generator: Arc<Generator>) -> Vec<BackendInfo> {
         .1
         .values()
         .map(|b| BackendInfo {
-            validator_code_hash: ckb_fixed_hash::H256(b.checksum.validator.into()),
-            generator_code_hash: ckb_fixed_hash::H256(b.checksum.generator.into()),
-            validator_script_type_hash: ckb_fixed_hash::H256(b.validator_script_type_hash.into()),
+            validator_code_hash: ckb_fixed_hash::H256(b.checksum.validator),
+            generator_code_hash: ckb_fixed_hash::H256(b.checksum.generator),
+            validator_script_type_hash: ckb_fixed_hash::H256(b.validator_script_type_hash),
             backend_type: to_rpc_backend_type(&b.backend_type),
         })
         .collect()
diff --git a/crates/rpc-server/src/utils.rs b/crates/rpc-server/src/utils.rs
index de6b46899..21d233d55 100644
--- a/crates/rpc-server/src/utils.rs
+++ b/crates/rpc-server/src/utils.rs
@@ -1,12 +1,12 @@
 use ckb_fixed_hash::H256 as JsonH256;
-use gw_common::H256;
+use gw_types::h256::H256;
 
+#[inline]
 pub(crate) fn to_h256(v: JsonH256) -> H256 {
-    let h: [u8; 32] = v.into();
-    h.into()
+    v.into()
 }
 
+#[inline]
 pub(crate) fn to_jsonh256(v: H256) -> JsonH256 {
-    let h: [u8; 32] = v.into();
-    h.into()
+    v.into()
 }
diff --git a/crates/smt/Cargo.toml b/crates/smt/Cargo.toml
new file mode 100644
index 000000000..0f5a98418
--- /dev/null
+++ b/crates/smt/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "gw-smt"
+version = "1.8.0-rc2"
+authors = ["Nervos Network"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+cfg-if = "0.1"
+sparse-merkle-tree = { version = "0.6.1", default-features = false }
+gw-hash = { path = "../../gwos/crates/hash" }
+gw-types = { path = "../../gwos/crates/types", default-features = false }
+
+[features]
+default = ["std"]
+std = ["sparse-merkle-tree/std", "gw-types/std"]
+smt-trie = ["sparse-merkle-tree/trie"]
diff --git a/crates/smt/src/lib.rs b/crates/smt/src/lib.rs
new file mode 100644
index 000000000..f24e14753
--- /dev/null
+++ b/crates/smt/src/lib.rs
@@ -0,0 +1,9 @@
+#![cfg_attr(not(feature = "std"), no_std)]
+
+pub mod merkle_utils;
+pub mod smt;
+pub mod smt_h256_ext;
+
+// re-exports
+pub use gw_hash::blake2b;
+pub use sparse_merkle_tree;
diff --git a/crates/smt/src/merkle_utils.rs b/crates/smt/src/merkle_utils.rs
new file mode 100644
index 000000000..38aba5c56
--- /dev/null
+++ b/crates/smt/src/merkle_utils.rs
@@ -0,0 +1,28 @@
+use crate::{
+    blake2b::new_blake2b,
+    smt::{default_store::DefaultStore, Error, SMT, SMTH256},
+    smt_h256_ext::SMTH256Ext,
+};
+use gw_types::h256::{H256Ext, H256};
+
+// Calculate compacted account root
+pub fn calculate_state_checkpoint(root: &H256, count: u32) -> H256 {
+    let mut hash = [0u8; 32];
+    let mut hasher = new_blake2b();
+    hasher.update(root.as_slice());
+    hasher.update(&count.to_le_bytes());
+    hasher.finalize(&mut hash);
+    hash
+}
+
+/// Compute merkle root from vectors
+pub fn calculate_merkle_root(leaves: Vec<H256>) -> Result<H256, Error> {
+    if leaves.is_empty() {
+        return Ok(H256::zero());
+    }
+    let mut tree = SMT::<DefaultStore<SMTH256>>::default();
+    for (i, leaf) in leaves.into_iter().enumerate() {
+        tree.update(SMTH256::from_u32(i as u32), leaf.into())?;
+    }
+    Ok((*tree.root()).into())
+}
diff --git a/crates/common/src/smt.rs b/crates/smt/src/smt.rs
similarity index 66%
rename from crates/common/src/smt.rs
rename to crates/smt/src/smt.rs
index ab32ea9f8..179188089 100644
--- a/crates/common/src/smt.rs
+++ b/crates/smt/src/smt.rs
@@ -2,9 +2,11 @@ use gw_hash::blake2b::{new_blake2b, Blake2b};
 use sparse_merkle_tree::{traits::Hasher, SparseMerkleTree};
 
 // re-exports
-pub use sparse_merkle_tree::{default_store, error::Error, CompiledMerkleProof, MerkleProof, H256};
+pub use sparse_merkle_tree::{
+    default_store, error::Error, CompiledMerkleProof, MerkleProof, H256 as SMTH256,
+};
 
-pub type SMT<S> = SparseMerkleTree<Blake2bHasher, H256, S>;
+pub type SMT<S> = SparseMerkleTree<Blake2bHasher, SMTH256, S>;
 
 pub struct Blake2bHasher(Blake2b);
 
@@ -15,7 +17,7 @@ impl Default for Blake2bHasher {
 }
 
 impl Hasher for Blake2bHasher {
-    fn write_h256(&mut self, h: &H256) {
+    fn write_h256(&mut self, h: &SMTH256) {
         self.0.update(h.as_slice());
     }
 
@@ -23,7 +25,7 @@ impl Hasher for Blake2bHasher {
         self.0.update(&[b][..]);
     }
 
-    fn finish(self) -> H256 {
+    fn finish(self) -> SMTH256 {
         let mut hash = [0u8; 32];
         self.0.finalize(&mut hash);
         hash.into()
diff --git a/crates/smt/src/smt_h256_ext.rs b/crates/smt/src/smt_h256_ext.rs
new file mode 100644
index 000000000..f3d7bdf8a
--- /dev/null
+++ b/crates/smt/src/smt_h256_ext.rs
@@ -0,0 +1,70 @@
+// type aliases
+
+use gw_types::U256;
+pub use sparse_merkle_tree::H256 as SMTH256;
+
+pub trait SMTH256Ext {
+    fn one() -> Self;
+    fn from_u32(n: u32) -> Self;
+    fn to_u32(&self) -> u32;
+    fn from_u64(n: u64) -> Self;
+    fn to_u64(&self) -> u64;
+    fn from_u128(n: u128) -> Self;
+    fn to_u128(&self) -> u128;
+    fn from_u256(n: U256) -> Self;
+    fn to_u256(&self) -> U256;
+}
+
+impl SMTH256Ext for SMTH256 {
+    fn one() -> Self {
+        Self::from_u32(1)
+    }
+
+    fn from_u32(n: u32) -> Self {
+        let mut buf = [0u8; 32];
+        buf[..4].copy_from_slice(&n.to_le_bytes());
+        buf.into()
+    }
+
+    fn to_u32(&self) -> u32 {
+        let mut n_bytes = [0u8; 4];
+        n_bytes.copy_from_slice(&self.as_slice()[..4]);
+        u32::from_le_bytes(n_bytes)
+    }
+
+    fn from_u64(n: u64) -> Self {
+        let mut buf = [0u8; 32];
+        buf[..8].copy_from_slice(&n.to_le_bytes());
+        buf.into()
+    }
+
+    fn to_u64(&self) -> u64 {
+        let mut n_bytes = [0u8; 8];
+        n_bytes.copy_from_slice(&self.as_slice()[..8]);
+        u64::from_le_bytes(n_bytes)
+    }
+
+    fn from_u128(n: u128) -> Self {
+        let mut buf = [0u8; 32];
+        buf[..16].copy_from_slice(&n.to_le_bytes());
+        buf.into()
+    }
+
+    fn to_u128(&self) -> u128 {
+        let mut n_bytes = [0u8; 16];
+        n_bytes.copy_from_slice(&self.as_slice()[..16]);
+        u128::from_le_bytes(n_bytes)
+    }
+
+    fn from_u256(n: U256) -> Self {
+        let mut buf = [0u8; 32];
+        n.to_little_endian(&mut buf);
+        buf.into()
+    }
+
+    fn to_u256(&self) -> U256 {
+        let mut n_bytes = [0u8; 32];
+        n_bytes.copy_from_slice(&self.as_slice()[..32]);
+        U256::from_little_endian(&n_bytes)
+    }
+}
diff --git a/crates/store/Cargo.toml b/crates/store/Cargo.toml
index af7c64f7c..3a42c582f 100644
--- a/crates/store/Cargo.toml
+++ b/crates/store/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-store"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 
@@ -8,14 +8,15 @@ edition = "2018"
 
 [dependencies]
 gw-db = { path = "../db" }
-gw-types = { path = "../types" }
+gw-types = { path = "../../gwos/crates/types" }
 gw-config = { path = "../config" }
-gw-common = { path = "../common" }
+gw-common = { path = "../../gwos/crates/common" }
 gw-traits = { path = "../traits" }
+gw-smt = { path = "../smt" }
 anyhow = "1.0"
 arc-swap = "1.5.0"
 log = "0.4"
 im = "15.1.0"
 
 [features]
-smt-trie = ["gw-common/smt-trie"]
+smt-trie = ["gw-smt/smt-trie"]
diff --git a/crates/store/src/chain_view.rs b/crates/store/src/chain_view.rs
index 95eaaa0c0..e416c8d6d 100644
--- a/crates/store/src/chain_view.rs
+++ b/crates/store/src/chain_view.rs
@@ -1,8 +1,8 @@
 //! ChainView implement ChainStore
 
 use anyhow::{bail, Result};
-use gw_common::H256;
 use gw_traits::ChainView as ChainViewTrait;
+use gw_types::h256::*;
 
 use crate::traits::chain_store::ChainStore;
 
diff --git a/crates/store/src/readonly.rs b/crates/store/src/readonly.rs
index a2f814f3b..6dc541ac4 100644
--- a/crates/store/src/readonly.rs
+++ b/crates/store/src/readonly.rs
@@ -1,8 +1,8 @@
-use gw_common::H256;
 use gw_db::{
     read_only_db::ReadOnlyDB,
     schema::{Col, COLUMN_REVERTED_BLOCK_SMT_ROOT},
 };
+use gw_types::h256::*;
 use gw_types::{
     from_box_should_be_ok, packed,
     prelude::{Entity, FromSliceShouldBeOk, Unpack},
diff --git a/crates/store/src/smt/serde.rs b/crates/store/src/smt/serde.rs
index 87f304c32..ea0346fc2 100644
--- a/crates/store/src/smt/serde.rs
+++ b/crates/store/src/smt/serde.rs
@@ -1,6 +1,6 @@
 use std::convert::TryInto;
 
-use gw_common::sparse_merkle_tree::{merge::MergeValue, BranchKey, BranchNode};
+use gw_smt::sparse_merkle_tree::{merge::MergeValue, BranchKey, BranchNode};
 
 pub fn branch_key_to_vec(key: &BranchKey) -> Vec<u8> {
     let mut ret = Vec::with_capacity(33);
diff --git a/crates/store/src/smt/smt_store/smt_block.rs b/crates/store/src/smt/smt_store/smt_block.rs
index d61dd0925..8679957d9 100644
--- a/crates/store/src/smt/smt_store/smt_block.rs
+++ b/crates/store/src/smt/smt_store/smt_block.rs
@@ -3,16 +3,15 @@
 use std::convert::TryInto;
 
 use crate::traits::{chain_store::ChainStore, kv_store::KVStore};
-use gw_common::{
-    smt::SMT,
+use gw_db::schema::{COLUMN_BLOCK_SMT_BRANCH, COLUMN_BLOCK_SMT_LEAF};
+use gw_smt::{
+    smt::{SMT, SMTH256},
     sparse_merkle_tree::{
         error::Error as SMTError,
         traits::{StoreReadOps, StoreWriteOps},
         BranchKey, BranchNode,
     },
-    H256,
 };
-use gw_db::schema::{COLUMN_BLOCK_SMT_BRANCH, COLUMN_BLOCK_SMT_LEAF};
 
 use crate::smt::serde::{branch_key_to_vec, branch_node_to_vec, slice_to_branch_node};
 
@@ -21,7 +20,7 @@ pub struct SMTBlockStore<DB: KVStore>(DB);
 impl<DB: KVStore + ChainStore> SMTBlockStore<DB> {
     pub fn to_smt(self) -> anyhow::Result<SMT<Self>> {
         let root = self.inner_store().get_block_smt_root()?;
-        Ok(SMT::new(root, self))
+        Ok(SMT::new(root.into(), self))
     }
 }
 
@@ -35,7 +34,7 @@ impl<DB: KVStore> SMTBlockStore<DB> {
     }
 }
 
-impl<DB: KVStore> StoreReadOps<H256> for SMTBlockStore<DB> {
+impl<DB: KVStore> StoreReadOps<SMTH256> for SMTBlockStore<DB> {
     fn get_branch(&self, branch_key: &BranchKey) -> Result<Option<BranchNode>, SMTError> {
         match self
             .0
@@ -46,11 +45,11 @@ impl<DB: KVStore> StoreReadOps<H256> for SMTBlockStore<DB> {
         }
     }
 
-    fn get_leaf(&self, leaf_key: &H256) -> Result<Option<H256>, SMTError> {
+    fn get_leaf(&self, leaf_key: &SMTH256) -> Result<Option<SMTH256>, SMTError> {
         match self.0.get(COLUMN_BLOCK_SMT_LEAF, leaf_key.as_slice()) {
             Some(slice) if 32 == slice.len() => {
                 let leaf: [u8; 32] = slice.as_ref().try_into().unwrap();
-                Ok(Some(H256::from(leaf)))
+                Ok(Some(SMTH256::from(leaf)))
             }
             Some(_) => Err(SMTError::Store("get corrupted leaf".to_string())),
             None => Ok(None),
@@ -58,7 +57,7 @@ impl<DB: KVStore> StoreReadOps<H256> for SMTBlockStore<DB> {
     }
 }
 
-impl<DB: KVStore> StoreWriteOps<H256> for SMTBlockStore<DB> {
+impl<DB: KVStore> StoreWriteOps<SMTH256> for SMTBlockStore<DB> {
     fn insert_branch(&mut self, branch_key: BranchKey, branch: BranchNode) -> Result<(), SMTError> {
         self.0
             .insert_raw(
@@ -71,7 +70,7 @@ impl<DB: KVStore> StoreWriteOps<H256> for SMTBlockStore<DB> {
         Ok(())
     }
 
-    fn insert_leaf(&mut self, leaf_key: H256, leaf: H256) -> Result<(), SMTError> {
+    fn insert_leaf(&mut self, leaf_key: SMTH256, leaf: SMTH256) -> Result<(), SMTError> {
         self.0
             .insert_raw(COLUMN_BLOCK_SMT_LEAF, leaf_key.as_slice(), leaf.as_slice())
             .map_err(|err| SMTError::Store(format!("insert error {}", err)))?;
@@ -87,7 +86,7 @@ impl<DB: KVStore> StoreWriteOps<H256> for SMTBlockStore<DB> {
         Ok(())
     }
 
-    fn remove_leaf(&mut self, leaf_key: &H256) -> Result<(), SMTError> {
+    fn remove_leaf(&mut self, leaf_key: &SMTH256) -> Result<(), SMTError> {
         self.0
             .delete(COLUMN_BLOCK_SMT_LEAF, leaf_key.as_slice())
             .map_err(|err| SMTError::Store(format!("delete error {}", err)))?;
diff --git a/crates/store/src/smt/smt_store/smt_reverted_block.rs b/crates/store/src/smt/smt_store/smt_reverted_block.rs
index 03acfad7d..246cd675f 100644
--- a/crates/store/src/smt/smt_store/smt_reverted_block.rs
+++ b/crates/store/src/smt/smt_store/smt_reverted_block.rs
@@ -3,16 +3,15 @@
 use std::convert::TryInto;
 
 use crate::traits::{chain_store::ChainStore, kv_store::KVStore};
-use gw_common::{
-    smt::SMT,
+use gw_db::schema::{COLUMN_REVERTED_BLOCK_SMT_BRANCH, COLUMN_REVERTED_BLOCK_SMT_LEAF};
+use gw_smt::{
+    smt::{SMT, SMTH256},
     sparse_merkle_tree::{
         error::Error as SMTError,
         traits::{StoreReadOps, StoreWriteOps},
         BranchKey, BranchNode,
     },
-    H256,
 };
-use gw_db::schema::{COLUMN_REVERTED_BLOCK_SMT_BRANCH, COLUMN_REVERTED_BLOCK_SMT_LEAF};
 
 use crate::smt::serde::{branch_key_to_vec, branch_node_to_vec, slice_to_branch_node};
 
@@ -21,7 +20,7 @@ pub struct SMTRevertedBlockStore<DB>(DB);
 impl<DB: KVStore + ChainStore> SMTRevertedBlockStore<DB> {
     pub fn to_smt(self) -> anyhow::Result<SMT<Self>> {
         let root = self.inner_store().get_reverted_block_smt_root()?;
-        Ok(SMT::new(root, self))
+        Ok(SMT::new(root.into(), self))
     }
 }
 
@@ -35,7 +34,7 @@ impl<DB: KVStore> SMTRevertedBlockStore<DB> {
     }
 }
 
-impl<DB: KVStore> StoreReadOps<H256> for SMTRevertedBlockStore<DB> {
+impl<DB: KVStore> StoreReadOps<SMTH256> for SMTRevertedBlockStore<DB> {
     fn get_branch(&self, branch_key: &BranchKey) -> Result<Option<BranchNode>, SMTError> {
         match self.0.get(
             COLUMN_REVERTED_BLOCK_SMT_BRANCH,
@@ -46,14 +45,14 @@ impl<DB: KVStore> StoreReadOps<H256> for SMTRevertedBlockStore<DB> {
         }
     }
 
-    fn get_leaf(&self, leaf_key: &H256) -> Result<Option<H256>, SMTError> {
+    fn get_leaf(&self, leaf_key: &SMTH256) -> Result<Option<SMTH256>, SMTError> {
         match self
             .0
             .get(COLUMN_REVERTED_BLOCK_SMT_LEAF, leaf_key.as_slice())
         {
             Some(slice) if 32 == slice.len() => {
                 let leaf: [u8; 32] = slice.as_ref().try_into().unwrap();
-                Ok(Some(H256::from(leaf)))
+                Ok(Some(leaf.into()))
             }
             Some(_) => Err(SMTError::Store("get corrupted leaf".to_string())),
             None => Ok(None),
@@ -61,7 +60,7 @@ impl<DB: KVStore> StoreReadOps<H256> for SMTRevertedBlockStore<DB> {
     }
 }
 
-impl<DB: KVStore> StoreWriteOps<H256> for SMTRevertedBlockStore<DB> {
+impl<DB: KVStore> StoreWriteOps<SMTH256> for SMTRevertedBlockStore<DB> {
     fn insert_branch(&mut self, branch_key: BranchKey, branch: BranchNode) -> Result<(), SMTError> {
         self.0
             .insert_raw(
@@ -74,7 +73,7 @@ impl<DB: KVStore> StoreWriteOps<H256> for SMTRevertedBlockStore<DB> {
         Ok(())
     }
 
-    fn insert_leaf(&mut self, leaf_key: H256, leaf: H256) -> Result<(), SMTError> {
+    fn insert_leaf(&mut self, leaf_key: SMTH256, leaf: SMTH256) -> Result<(), SMTError> {
         self.0
             .insert_raw(
                 COLUMN_REVERTED_BLOCK_SMT_LEAF,
@@ -97,7 +96,7 @@ impl<DB: KVStore> StoreWriteOps<H256> for SMTRevertedBlockStore<DB> {
         Ok(())
     }
 
-    fn remove_leaf(&mut self, leaf_key: &H256) -> Result<(), SMTError> {
+    fn remove_leaf(&mut self, leaf_key: &SMTH256) -> Result<(), SMTError> {
         self.0
             .delete(COLUMN_REVERTED_BLOCK_SMT_LEAF, leaf_key.as_slice())
             .map_err(|err| SMTError::Store(format!("delete error {}", err)))?;
diff --git a/crates/store/src/smt/smt_store/smt_state.rs b/crates/store/src/smt/smt_store/smt_state.rs
index 7512cd827..16b897f97 100644
--- a/crates/store/src/smt/smt_store/smt_state.rs
+++ b/crates/store/src/smt/smt_store/smt_state.rs
@@ -3,16 +3,15 @@
 use std::convert::TryInto;
 
 use crate::traits::{chain_store::ChainStore, kv_store::KVStore};
-use gw_common::{
-    smt::SMT,
+use gw_db::schema::{COLUMN_ACCOUNT_SMT_BRANCH, COLUMN_ACCOUNT_SMT_LEAF};
+use gw_smt::{
+    smt::{SMT, SMTH256},
     sparse_merkle_tree::{
         error::Error as SMTError,
         traits::{StoreReadOps, StoreWriteOps},
         BranchKey, BranchNode,
     },
-    H256,
 };
-use gw_db::schema::{COLUMN_ACCOUNT_SMT_BRANCH, COLUMN_ACCOUNT_SMT_LEAF};
 
 use crate::smt::serde::{branch_key_to_vec, branch_node_to_vec, slice_to_branch_node};
 
@@ -45,7 +44,7 @@ impl<DB: KVStore> SMTStateStore<DB> {
     }
 }
 
-impl<DB: KVStore> StoreReadOps<H256> for SMTStateStore<DB> {
+impl<DB: KVStore> StoreReadOps<SMTH256> for SMTStateStore<DB> {
     fn get_branch(&self, branch_key: &BranchKey) -> Result<Option<BranchNode>, SMTError> {
         match self
             .0
@@ -56,18 +55,18 @@ impl<DB: KVStore> StoreReadOps<H256> for SMTStateStore<DB> {
         }
     }
 
-    fn get_leaf(&self, leaf_key: &H256) -> Result<Option<H256>, SMTError> {
+    fn get_leaf(&self, leaf_key: &SMTH256) -> Result<Option<SMTH256>, SMTError> {
         match self.0.get(COLUMN_ACCOUNT_SMT_LEAF, leaf_key.as_slice()) {
             Some(slice) if 32 == slice.len() => {
                 let leaf: [u8; 32] = slice.as_ref().try_into().unwrap();
-                Ok(Some(H256::from(leaf)))
+                Ok(Some(leaf.into()))
             }
             Some(_) => Err(SMTError::Store("get corrupted leaf".to_string())),
             None => Ok(None),
         }
     }
 }
-impl<DB: KVStore> StoreWriteOps<H256> for SMTStateStore<DB> {
+impl<DB: KVStore> StoreWriteOps<SMTH256> for SMTStateStore<DB> {
     fn insert_branch(&mut self, branch_key: BranchKey, branch: BranchNode) -> Result<(), SMTError> {
         self.0
             .insert_raw(
@@ -80,7 +79,7 @@ impl<DB: KVStore> StoreWriteOps<H256> for SMTStateStore<DB> {
         Ok(())
     }
 
-    fn insert_leaf(&mut self, leaf_key: H256, leaf: H256) -> Result<(), SMTError> {
+    fn insert_leaf(&mut self, leaf_key: SMTH256, leaf: SMTH256) -> Result<(), SMTError> {
         self.0
             .insert_raw(
                 COLUMN_ACCOUNT_SMT_LEAF,
@@ -100,7 +99,7 @@ impl<DB: KVStore> StoreWriteOps<H256> for SMTStateStore<DB> {
         Ok(())
     }
 
-    fn remove_leaf(&mut self, leaf_key: &H256) -> Result<(), SMTError> {
+    fn remove_leaf(&mut self, leaf_key: &SMTH256) -> Result<(), SMTError> {
         self.0
             .delete(COLUMN_ACCOUNT_SMT_LEAF, leaf_key.as_slice())
             .map_err(|err| SMTError::Store(format!("delete error {}", err)))?;
diff --git a/crates/store/src/state/history/block_state_record.rs b/crates/store/src/state/history/block_state_record.rs
index 980f69d14..6a748d2d4 100644
--- a/crates/store/src/state/history/block_state_record.rs
+++ b/crates/store/src/state/history/block_state_record.rs
@@ -1,4 +1,4 @@
-use gw_common::H256;
+use gw_types::h256::H256;
 // block_number(8 bytes) | key (32 bytes)
 #[derive(Hash, PartialEq, Eq)]
 pub struct BlockStateRecordKey([u8; 40]);
@@ -14,7 +14,7 @@ impl BlockStateRecordKey {
     pub fn state_key(&self) -> H256 {
         let mut inner = [0u8; 32];
         inner.copy_from_slice(&self.0[8..]);
-        inner.into()
+        inner
     }
 
     pub fn block_number(&self) -> u64 {
@@ -48,7 +48,7 @@ impl BlockStateRecordKeyReverse {
     pub fn state_key(&self) -> H256 {
         let mut inner = [0u8; 32];
         inner.copy_from_slice(&self.0[..32]);
-        inner.into()
+        inner
     }
 
     pub fn block_number(&self) -> u64 {
diff --git a/crates/store/src/state/history/history_state.rs b/crates/store/src/state/history/history_state.rs
index 5cbe93a3d..29535c83e 100644
--- a/crates/store/src/state/history/history_state.rs
+++ b/crates/store/src/state/history/history_state.rs
@@ -1,10 +1,12 @@
 //! State DB
 
 use anyhow::Result;
-use gw_common::{error::Error as StateError, smt::SMT, state::State, H256};
+use gw_common::{error::Error as StateError, state::State};
+use gw_smt::smt::SMT;
 use gw_traits::CodeStore;
 use gw_types::{
     bytes::Bytes,
+    h256::*,
     packed::{self, AccountMerkleState, Byte32},
     prelude::*,
 };
@@ -103,8 +105,9 @@ impl<Store: HistoryStateStore + CodeStore + KVStore> HistoryState<Store> {
     }
 
     pub fn get_merkle_state(&self) -> AccountMerkleState {
+        let root: H256 = (*self.tree.root()).into();
         AccountMerkleState::new_builder()
-            .merkle_root(self.tree.root().pack())
+            .merkle_root(root.pack())
             .count(self.account_count.pack())
             .build()
     }
@@ -152,7 +155,11 @@ impl<Store: KVStore + HistoryStateStore + CodeStore> State for HistoryState<Stor
                 .db()
                 .get_history_state(block_number, key)
                 .unwrap_or_default(),
-            _ => self.tree.get(key)?,
+            _ => self
+                .tree
+                .get(&(*key).into())
+                .map_err(|err| StateError::SMT(err.to_string()))?
+                .into(),
         };
         if log_enabled!(log::Level::Trace) {
             let k: Byte32 = key.pack();
@@ -168,7 +175,9 @@ impl<Store: KVStore + HistoryStateStore + CodeStore> State for HistoryState<Stor
     }
 
     fn update_raw(&mut self, key: H256, value: H256) -> Result<(), StateError> {
-        self.tree.update(key, value)?;
+        self.tree
+            .update(key.into(), value.into())
+            .map_err(|err| StateError::SMT(err.to_string()))?;
         // record block's kv state
         match self.rw_config.write {
             WriteOpt::Block(block_number) => {
@@ -222,8 +231,8 @@ impl<Store: KVStore + HistoryStateStore + CodeStore> State for HistoryState<Stor
     }
 
     fn calculate_root(&self) -> Result<H256, StateError> {
-        let root = self.tree.root();
-        Ok(*root)
+        let root = (*self.tree.root()).into();
+        Ok(root)
     }
 }
 
diff --git a/crates/store/src/state/overlay/mem_state.rs b/crates/store/src/state/overlay/mem_state.rs
index dd33ce00a..fffbe3f64 100644
--- a/crates/store/src/state/overlay/mem_state.rs
+++ b/crates/store/src/state/overlay/mem_state.rs
@@ -6,12 +6,14 @@ use crate::snapshot::StoreSnapshot;
 use crate::traits::kv_store::KVStoreRead;
 use crate::traits::kv_store::KVStoreWrite;
 use anyhow::Result;
-use gw_common::{error::Error as StateError, smt::SMT, state::State, H256};
+use gw_common::{error::Error as StateError, state::State};
 use gw_db::schema::{COLUMN_DATA, COLUMN_SCRIPT};
+use gw_smt::smt::SMT;
 use gw_traits::CodeStore;
 use gw_types::from_box_should_be_ok;
 use gw_types::{
     bytes::Bytes,
+    h256::*,
     packed::{self, AccountMerkleState},
     prelude::*,
 };
@@ -32,8 +34,9 @@ impl MemStateTree {
     }
 
     pub fn get_merkle_state(&self) -> AccountMerkleState {
+        let root: H256 = (*self.tree.root()).into();
         AccountMerkleState::new_builder()
-            .merkle_root(self.tree.root().pack())
+            .merkle_root(root.pack())
             .count(self.account_count.pack())
             .build()
     }
@@ -58,12 +61,18 @@ impl Clone for MemStateTree {
 
 impl State for MemStateTree {
     fn get_raw(&self, key: &H256) -> Result<H256, StateError> {
-        let v = self.tree.get(key)?;
+        let v = self
+            .tree
+            .get(&(*key).into())
+            .map(|v| v.into())
+            .map_err(|err| StateError::SMT(err.to_string()))?;
         Ok(v)
     }
 
     fn update_raw(&mut self, key: H256, value: H256) -> Result<(), StateError> {
-        self.tree.update(key, value)?;
+        self.tree
+            .update(key.into(), value.into())
+            .map_err(|err| StateError::SMT(err.to_string()))?;
         Ok(())
     }
 
@@ -77,8 +86,8 @@ impl State for MemStateTree {
     }
 
     fn calculate_root(&self) -> Result<H256, StateError> {
-        let root = self.tree.root();
-        Ok(*root)
+        let root = (*self.tree.root()).into();
+        Ok(root)
     }
 }
 
diff --git a/crates/store/src/state/overlay/mem_store.rs b/crates/store/src/state/overlay/mem_store.rs
index 8e8b5cafd..26563ca53 100644
--- a/crates/store/src/state/overlay/mem_store.rs
+++ b/crates/store/src/state/overlay/mem_store.rs
@@ -6,12 +6,13 @@ use std::{
 };
 
 use anyhow::Result;
-use gw_common::H256;
 use gw_db::schema::{Col, COLUMN_DATA, COLUMN_SCRIPT};
 use gw_traits::CodeStore;
 use gw_types::{
     bytes::Bytes,
-    from_box_should_be_ok, packed,
+    from_box_should_be_ok,
+    h256::H256,
+    packed,
     prelude::{Entity, FromSliceShouldBeOk},
 };
 use im::HashMap;
diff --git a/crates/store/src/state/state_db.rs b/crates/store/src/state/state_db.rs
index 5cb965f7b..a3d3303e3 100644
--- a/crates/store/src/state/state_db.rs
+++ b/crates/store/src/state/state_db.rs
@@ -21,7 +21,9 @@ use gw_types::{
     prelude::{Pack, Unpack},
 };
 
-use gw_common::{error::Error as StateError, smt::SMT, state::State, H256};
+use gw_common::{error::Error as StateError, state::State};
+use gw_smt::smt::SMT;
+use gw_types::h256::{H256Ext, H256};
 
 use crate::{
     smt::smt_store::SMTStateStore,
@@ -167,10 +169,8 @@ impl MemStateDB {
         // build from last valid block
         let block = store.get_last_valid_tip_block()?;
         let tip_state = block.raw().post_account();
-        let smt = SMT::new(
-            tip_state.merkle_root().unpack(),
-            SMTStateStore::new(MemStore::new(store)),
-        );
+        let root: H256 = tip_state.merkle_root().unpack();
+        let smt = SMT::new(root.into(), SMTStateStore::new(MemStore::new(store)));
         let inner = MemStateTree::new(smt, tip_state.count().unpack());
         Ok(Self::new(inner))
     }
@@ -186,7 +186,8 @@ impl<Store: ChainStore + HistoryStateStore + CodeStore + KVStore> BlockStateDB<S
         // build from last valid block
         let block = store.get_last_valid_tip_block()?;
         let tip_state = block.raw().post_account();
-        let smt = SMT::new(tip_state.merkle_root().unpack(), SMTStateStore::new(store));
+        let root: H256 = tip_state.merkle_root().unpack();
+        let smt = SMT::new(root.into(), SMTStateStore::new(store));
         let inner = HistoryState::new(smt, tip_state.count().unpack(), rw_config);
         Ok(Self::new(inner))
     }
@@ -529,8 +530,10 @@ impl<S: CodeStore> CodeStore for StateDB<S> {
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
-    use gw_common::{h256_ext::H256Ext, smt::SMT, state::State, H256};
+    use gw_common::state::State;
+    use gw_smt::smt::{SMT, SMTH256};
     use gw_traits::CodeStore;
+    use gw_types::h256::{H256Ext, H256};
 
     use crate::{
         smt::smt_store::SMTStateStore,
@@ -546,13 +549,13 @@ mod tests {
     };
 
     fn new_state(store: StoreSnapshot) -> MemStateDB {
-        let smt = SMT::new(H256::zero(), SMTStateStore::new(MemStore::new(store)));
+        let smt = SMT::new(SMTH256::zero(), SMTStateStore::new(MemStore::new(store)));
         let inner = MemStateTree::new(smt, 0);
         MemStateDB::new(inner)
     }
 
     fn new_block_state(store: &StoreTransaction) -> BlockStateDB<&'_ StoreTransaction> {
-        let smt = SMT::new(H256::zero(), SMTStateStore::new(store));
+        let smt = SMT::new(SMTH256::zero(), SMTStateStore::new(store));
         let inner = HistoryState::new(
             smt,
             0,
@@ -754,7 +757,7 @@ mod tests {
         assert!(s.calculate_root().is_err());
         // test finalise value
         s.finalise()?;
-        assert_eq!(s.calculate_root()?, EXPECTED_ROOT.into());
+        assert_eq!(s.calculate_root()?, EXPECTED_ROOT);
         for i in 1..42u32 {
             let key = H256::from_u32(i);
             let value2 = H256::from_u32(i + 1);
@@ -768,7 +771,7 @@ mod tests {
         assert!(s.calculate_root().is_err());
         // test finalise value
         s.finalise()?;
-        assert_eq!(s.calculate_root()?, EXPECTED_ROOT.into());
+        assert_eq!(s.calculate_root()?, EXPECTED_ROOT);
         Ok(())
     }
 
diff --git a/crates/store/src/state/traits.rs b/crates/store/src/state/traits.rs
index 8a0c23fc4..c2df79929 100644
--- a/crates/store/src/state/traits.rs
+++ b/crates/store/src/state/traits.rs
@@ -1,4 +1,4 @@
-use gw_common::smt::SMT;
+use gw_smt::smt::SMT;
 use gw_types::packed::LogItem;
 
 use super::state_db::StateTracker;
diff --git a/crates/store/src/store_impl.rs b/crates/store/src/store_impl.rs
index 133fda731..aa6c9ef5a 100644
--- a/crates/store/src/store_impl.rs
+++ b/crates/store/src/store_impl.rs
@@ -9,7 +9,7 @@ use crate::write_batch::StoreWriteBatch;
 use crate::{snapshot::StoreSnapshot, transaction::StoreTransaction};
 use anyhow::Result;
 use gw_common::error::Error;
-use gw_common::smt::Blake2bHasher;
+use gw_smt::smt::Blake2bHasher;
 
 use gw_db::{
     schema::{Col, COLUMNS},
diff --git a/crates/store/src/tests/state_db.rs b/crates/store/src/tests/state_db.rs
index 35c71f8d4..fd13f2493 100644
--- a/crates/store/src/tests/state_db.rs
+++ b/crates/store/src/tests/state_db.rs
@@ -4,9 +4,10 @@ use crate::{
     transaction::StoreTransaction,
     Store,
 };
-use gw_common::{h256_ext::H256Ext, merkle_utils::calculate_state_checkpoint, state::State, H256};
+use gw_common::{merkle_utils::calculate_state_checkpoint, state::State};
 use gw_db::schema::COLUMN_BLOCK;
 use gw_types::{
+    h256::*,
     packed::{
         AccountMerkleState, L2Block, NumberHash, RawL2Block, SubmitTransactions, Transaction,
     },
diff --git a/crates/store/src/traits/chain_store.rs b/crates/store/src/traits/chain_store.rs
index 9a31a6eba..2455c3423 100644
--- a/crates/store/src/traits/chain_store.rs
+++ b/crates/store/src/traits/chain_store.rs
@@ -2,7 +2,6 @@
 
 use crate::traits::kv_store::KVStoreRead;
 use anyhow::Result;
-use gw_common::H256;
 use gw_db::schema::{
     COLUMN_ASSET_SCRIPT, COLUMN_BAD_BLOCK, COLUMN_BAD_BLOCK_CHALLENGE_TARGET, COLUMN_BLOCK,
     COLUMN_BLOCK_DEPOSIT_INFO_VEC, COLUMN_BLOCK_GLOBAL_STATE,
@@ -15,6 +14,7 @@ use gw_db::schema::{
     META_LAST_SUBMITTED_BLOCK_NUMBER_HASH_KEY, META_LAST_VALID_TIP_BLOCK_HASH_KEY,
     META_REVERTED_BLOCK_SMT_ROOT_KEY, META_TIP_BLOCK_HASH_KEY,
 };
+use gw_types::h256::*;
 use gw_types::{
     from_box_should_be_ok,
     offchain::{global_state_from_slice, SMTRevertedBlockHashes},
@@ -44,7 +44,7 @@ pub trait ChainStore: KVStoreRead {
         debug_assert_eq!(slice.len(), 32);
         let mut chain_id = [0u8; 32];
         chain_id.copy_from_slice(&slice);
-        Ok(chain_id.into())
+        Ok(chain_id)
     }
 
     fn get_block_smt_root(&self) -> Result<H256> {
@@ -54,7 +54,7 @@ pub trait ChainStore: KVStoreRead {
         debug_assert_eq!(slice.len(), 32);
         let mut root = [0u8; 32];
         root.copy_from_slice(&slice);
-        Ok(root.into())
+        Ok(root)
     }
 
     fn get_reverted_block_smt_root(&self) -> Result<H256> {
@@ -64,7 +64,7 @@ pub trait ChainStore: KVStoreRead {
         debug_assert_eq!(slice.len(), 32);
         let mut root = [0u8; 32];
         root.copy_from_slice(&slice);
-        Ok(root.into())
+        Ok(root)
     }
 
     fn get_prev_reverted_block_smt_root(&self, root: &H256) -> Result<Option<H256>> {
diff --git a/crates/store/src/transaction/code_store_impl.rs b/crates/store/src/transaction/code_store_impl.rs
index 37ba73602..0667c8279 100644
--- a/crates/store/src/transaction/code_store_impl.rs
+++ b/crates/store/src/transaction/code_store_impl.rs
@@ -1,6 +1,6 @@
-use gw_common::H256;
 use gw_db::schema::{COLUMN_DATA, COLUMN_SCRIPT};
 use gw_traits::CodeStore;
+use gw_types::h256::*;
 use gw_types::{bytes::Bytes, from_box_should_be_ok, packed, prelude::*};
 
 use crate::traits::kv_store::{KVStoreRead, KVStoreWrite};
diff --git a/crates/store/src/transaction/history_store_impl.rs b/crates/store/src/transaction/history_store_impl.rs
index 2762c528c..5da92709f 100644
--- a/crates/store/src/transaction/history_store_impl.rs
+++ b/crates/store/src/transaction/history_store_impl.rs
@@ -1,9 +1,9 @@
 use anyhow::Error;
-use gw_common::H256;
 use gw_db::{
     schema::{COLUMN_BLOCK_STATE_RECORD, COLUMN_BLOCK_STATE_REVERSE_RECORD},
     DBRawIterator, Direction, IteratorMode,
 };
+use gw_types::h256::*;
 
 use crate::{
     state::history::{
@@ -70,7 +70,7 @@ impl HistoryStateStore for &StoreTransaction {
                     .map(|raw| {
                         let mut buf = [0u8; 32];
                         buf.copy_from_slice(&raw);
-                        buf.into()
+                        buf
                     })
             }
             _ => None,
diff --git a/crates/store/src/transaction/store_transaction.rs b/crates/store/src/transaction/store_transaction.rs
index d6aa2a0fa..2030b183a 100644
--- a/crates/store/src/transaction/store_transaction.rs
+++ b/crates/store/src/transaction/store_transaction.rs
@@ -5,8 +5,7 @@ use crate::traits::chain_store::ChainStore;
 use crate::traits::kv_store::KVStoreRead;
 use crate::traits::kv_store::{KVStore, KVStoreWrite};
 use anyhow::{bail, Context, Result};
-use gw_common::h256_ext::H256Ext;
-use gw_common::{merkle_utils::calculate_state_checkpoint, smt::SMT, H256};
+use gw_common::merkle_utils::calculate_state_checkpoint;
 use gw_db::schema::{
     Col, COLUMN_ASSET_SCRIPT, COLUMN_BAD_BLOCK, COLUMN_BAD_BLOCK_CHALLENGE_TARGET, COLUMN_BLOCK,
     COLUMN_BLOCK_DEPOSIT_INFO_VEC, COLUMN_BLOCK_GLOBAL_STATE,
@@ -20,9 +19,14 @@ use gw_db::schema::{
     META_REVERTED_BLOCK_SMT_ROOT_KEY, META_TIP_BLOCK_HASH_KEY,
 };
 use gw_db::{iter::DBIter, DBIterator, IteratorMode, RocksDBTransaction};
+use gw_smt::{
+    smt::{SMT, SMTH256},
+    smt_h256_ext::SMTH256Ext,
+};
 use gw_types::packed::NumberHash;
 use gw_types::{
     from_box_should_be_ok,
+    h256::H256,
     packed::{
         self, AccountMerkleState, Byte32, ChallengeTarget, Script, TransactionKey, WithdrawalKey,
     },
@@ -81,7 +85,6 @@ impl StoreTransaction {
     }
 
     pub fn set_tip_block_hash(&self, block_hash: H256) -> Result<()> {
-        let block_hash: [u8; 32] = block_hash.into();
         self.insert_raw(COLUMN_META, META_TIP_BLOCK_HASH_KEY, &block_hash)
     }
 
@@ -229,20 +232,20 @@ impl StoreTransaction {
 
         for block_hash in block_hashes.into_iter() {
             reverted_block_smt
-                .update(block_hash, H256::zero())
+                .update(block_hash.into(), SMTH256::zero())
                 .context("reset reverted block smt")?;
         }
 
-        self.set_reverted_block_smt_root(*reverted_block_smt.root())
+        self.set_reverted_block_smt_root((*reverted_block_smt.root()).into())
     }
 
     pub fn rewind_block_smt(&self, block: &packed::L2Block) -> Result<()> {
         let mut block_smt = self.block_smt()?;
         block_smt
-            .update(block.smt_key().into(), H256::zero())
+            .update(block.smt_key().into(), SMTH256::zero())
             .context("reset block smt")?;
 
-        self.set_block_smt_root(*block_smt.root())
+        self.set_block_smt_root((*block_smt.root()).into())
     }
 
     fn set_last_valid_tip_block_hash(&self, block_hash: &H256) -> Result<()> {
@@ -362,7 +365,7 @@ impl StoreTransaction {
         block_smt
             .update(block.smt_key().into(), block_hash.into())
             .context("update block smt")?;
-        self.set_block_smt_root(*block_smt.root())?;
+        self.set_block_smt_root((*block_smt.root()).into())?;
 
         // Update tip block
         self.insert_raw(COLUMN_META, META_TIP_BLOCK_HASH_KEY, &block_hash)?;
@@ -390,17 +393,17 @@ impl StoreTransaction {
 
             // Remove block from smt
             block_smt
-                .update(block.smt_key().into(), H256::zero())
+                .update(block.smt_key().into(), SMTH256::zero())
                 .context("update block smt")?;
 
             // Add block to reverted smt
             reverted_block_smt
-                .update(block_hash.into(), H256::one())
+                .update(block_hash.into(), SMTH256::one())
                 .context("update reverted block smt")?;
         }
 
-        self.set_block_smt_root(*block_smt.root())?;
-        self.set_reverted_block_smt_root(*reverted_block_smt.root())?;
+        self.set_block_smt_root((*block_smt.root()).into())?;
+        self.set_reverted_block_smt_root((*reverted_block_smt.root()).into())?;
 
         // Revert tip block to parent block
         let parent_block_hash: [u8; 32] = {
@@ -448,11 +451,11 @@ impl StoreTransaction {
             .update(raw.smt_key().into(), raw.hash().into())
             .context("update block smt")?;
         let root = block_smt.root();
-        self.set_block_smt_root(*root)?;
+        self.set_block_smt_root((*root).into())?;
 
         // update tip
         self.insert_raw(COLUMN_META, META_TIP_BLOCK_HASH_KEY, &block_hash)?;
-        self.set_last_valid_tip_block_hash(&block_hash.into())?;
+        self.set_last_valid_tip_block_hash(&block_hash)?;
 
         Ok(())
     }
@@ -469,7 +472,7 @@ impl StoreTransaction {
         // check
         {
             let tip = self.get_last_valid_tip_block_hash()?;
-            assert_eq!(tip, H256::from(block.raw().hash()), "Must detach from tip");
+            assert_eq!(tip, block.raw().hash(), "Must detach from tip");
         }
         {
             let number: u64 = block.raw().number().unpack();
@@ -487,7 +490,7 @@ impl StoreTransaction {
             self.delete(COLUMN_WITHDRAWAL_INFO, &withdrawal_hash)?;
         }
 
-        let block_hash: H256 = block.hash().into();
+        let block_hash: H256 = block.hash();
 
         // remove index
         let block_number = block.raw().number();
@@ -497,10 +500,10 @@ impl StoreTransaction {
         // update block tree
         let mut block_smt = self.block_smt()?;
         block_smt
-            .update(block.smt_key().into(), H256::zero())
+            .update(block.smt_key().into(), SMTH256::zero())
             .context("update block smt")?;
         let root = block_smt.root();
-        self.set_block_smt_root(*root)?;
+        self.set_block_smt_root((*root).into())?;
 
         // update tip
         let block_number: u64 = block_number.unpack();
@@ -556,7 +559,8 @@ impl StoreTransaction {
         merkle_state: AccountMerkleState,
     ) -> Result<SMT<SMTStateStore<&Self>>> {
         let store = SMTStateStore::new(self);
-        Ok(SMT::new(merkle_state.merkle_root().unpack(), store))
+        let root: H256 = merkle_state.merkle_root().unpack();
+        Ok(SMT::new(root.into(), store))
     }
 
     pub fn insert_mem_pool_transaction(
diff --git a/crates/telemetry/Cargo.toml b/crates/telemetry/Cargo.toml
index a54211d4e..71bd68791 100644
--- a/crates/telemetry/Cargo.toml
+++ b/crates/telemetry/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-telemetry"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/crates/tests/Cargo.toml b/crates/tests/Cargo.toml
index 5c6a9a197..22ceb4111 100644
--- a/crates/tests/Cargo.toml
+++ b/crates/tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-tests"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 authors = ["jjy <jjyruby@gmail.com>"]
 edition = "2018"
 
@@ -10,8 +10,9 @@ edition = "2018"
 scripts = []
 
 [dependencies]
-gw-types = { path = "../types", features = ["std", "deprecated"] }
-gw-common = { path = "../common" }
+gw-types = { path = "../../gwos/crates/types", features = ["std", "deprecated"] }
+gw-common = { path = "../../gwos/crates/common" }
+gw-smt = { path = "../smt" }
 gw-config = { path = "../config" }
 gw-db = { path = "../db" }
 gw-store = { path = "../store" }
@@ -32,7 +33,7 @@ blake2b-rs = "0.2"
 ckb-vm = { version = "=0.22.0", default-features = false }
 thiserror = "1.0"
 lazy_static = "1.4"
-secp256k1 = { version = "0.21", features = ["recovery", "rand-std"] }
+secp256k1 = { version = "0.24", features = ["recovery", "rand-std"] }
 async-jsonrpc-client = { version = "0.3.0", default-features = false, features = ["http-tokio"] }
 sha3 = "0.10.6"
 hex = "0.4.2"
diff --git a/crates/tests/src/script_tests/account_lock_scripts/mod.rs b/crates/tests/src/script_tests/account_lock_scripts/mod.rs
index 3ef36fd2b..a4787c0b5 100644
--- a/crates/tests/src/script_tests/account_lock_scripts/mod.rs
+++ b/crates/tests/src/script_tests/account_lock_scripts/mod.rs
@@ -1,2 +1 @@
 mod eth_account_lock;
-mod tron_account_lock;
diff --git a/crates/tests/src/script_tests/account_lock_scripts/tron_account_lock.rs b/crates/tests/src/script_tests/account_lock_scripts/tron_account_lock.rs
deleted file mode 100644
index 984259a2c..000000000
--- a/crates/tests/src/script_tests/account_lock_scripts/tron_account_lock.rs
+++ /dev/null
@@ -1,333 +0,0 @@
-use crate::script_tests::programs::{
-    SECP256K1_DATA, TRON_ACCOUNT_LOCK_CODE_HASH, TRON_ACCOUNT_LOCK_PROGRAM,
-};
-use crate::script_tests::utils::layer1::*;
-use crate::testing_tool::chain::{ALWAYS_SUCCESS_CODE_HASH, ALWAYS_SUCCESS_PROGRAM};
-use ckb_crypto::secp::{Generator, Privkey, Pubkey};
-use ckb_error::assert_error_eq;
-use ckb_script::{ScriptError, TransactionScriptsVerifier};
-use ckb_types::{
-    bytes::Bytes,
-    core::{Capacity, DepType, ScriptHashType, TransactionBuilder, TransactionView},
-    packed::{CellDep, CellInput, CellOutput, OutPoint, Script, WitnessArgs},
-    prelude::*,
-};
-use gw_types::core::SigningType;
-use rand::{thread_rng, Rng};
-use sha3::{Digest, Keccak256};
-
-use std::convert::TryInto;
-
-const ERROR_WRONG_SIGNATURE: i8 = 41;
-
-fn gen_tx(
-    dummy: &mut DummyDataLoader,
-    lock_args: Bytes,
-    signing_type: SigningType,
-    message: Bytes,
-) -> TransactionView {
-    let mut rng = thread_rng();
-    // setup sighash_all dep
-    let script_out_point = {
-        let tx_hash = {
-            let mut buf = [0u8; 32];
-            rng.fill(&mut buf);
-            buf.pack()
-        };
-        OutPoint::new(tx_hash, 0)
-    };
-    let owner_lock_script_out_point = {
-        let tx_hash = {
-            let mut buf = [0u8; 32];
-            rng.fill(&mut buf);
-            buf.pack()
-        };
-        OutPoint::new(tx_hash, 0)
-    };
-    // dep contract code
-    // eth account lock
-    let script_cell = CellOutput::new_builder()
-        .capacity(
-            Capacity::bytes(TRON_ACCOUNT_LOCK_PROGRAM.len())
-                .expect("script capacity")
-                .pack(),
-        )
-        .build();
-    let script_cell_data_hash = CellOutput::calc_data_hash(&TRON_ACCOUNT_LOCK_PROGRAM);
-    dummy.cells.insert(
-        script_out_point.clone(),
-        (script_cell, TRON_ACCOUNT_LOCK_PROGRAM.clone()),
-    );
-    // owner lock
-    let script_cell = CellOutput::new_builder()
-        .capacity(
-            Capacity::bytes(ALWAYS_SUCCESS_PROGRAM.len())
-                .expect("script capacity")
-                .pack(),
-        )
-        .build();
-    dummy.cells.insert(
-        owner_lock_script_out_point.clone(),
-        (script_cell, ALWAYS_SUCCESS_PROGRAM.clone()),
-    );
-    // owner lock cell
-    let owner_lock_cell = CellOutput::new_builder()
-        .lock(
-            Script::new_builder()
-                .code_hash((*ALWAYS_SUCCESS_CODE_HASH).pack())
-                .hash_type(ScriptHashType::Data.into())
-                .build(),
-        )
-        .build();
-    let owner_lock_hash = owner_lock_cell.lock().calc_script_hash().unpack();
-    let owner_lock_cell_out_point = {
-        let tx_hash = {
-            let mut buf = [0u8; 32];
-            rng.fill(&mut buf);
-            buf.pack()
-        };
-        OutPoint::new(tx_hash, 0)
-    };
-    dummy.cells.insert(
-        owner_lock_cell_out_point.clone(),
-        (owner_lock_cell, Bytes::default()),
-    );
-    // setup secp256k1_data dep
-    let secp256k1_data_out_point = {
-        let tx_hash = {
-            let mut buf = [0u8; 32];
-            rng.fill(&mut buf);
-            buf.pack()
-        };
-        OutPoint::new(tx_hash, 0)
-    };
-    let secp256k1_data_cell = CellOutput::new_builder()
-        .capacity(
-            Capacity::bytes(SECP256K1_DATA.len())
-                .expect("data capacity")
-                .pack(),
-        )
-        .build();
-    dummy.cells.insert(
-        secp256k1_data_out_point.clone(),
-        (secp256k1_data_cell, SECP256K1_DATA.clone()),
-    );
-    // setup default tx builder
-    let dummy_capacity = Capacity::shannons(42);
-    let tx_builder = TransactionBuilder::default()
-        .cell_dep(
-            CellDep::new_builder()
-                .out_point(script_out_point)
-                .dep_type(DepType::Code.into())
-                .build(),
-        )
-        .cell_dep(
-            CellDep::new_builder()
-                .out_point(secp256k1_data_out_point)
-                .dep_type(DepType::Code.into())
-                .build(),
-        )
-        .cell_dep(
-            CellDep::new_builder()
-                .out_point(owner_lock_script_out_point)
-                .dep_type(DepType::Code.into())
-                .build(),
-        )
-        .output(
-            CellOutput::new_builder()
-                .capacity(dummy_capacity.pack())
-                .build(),
-        )
-        .output_data(Bytes::new().pack());
-
-    let previous_out_point = {
-        let previous_tx_hash = {
-            let mut buf = [0u8; 32];
-            rng.fill(&mut buf);
-            buf.pack()
-        };
-        OutPoint::new(previous_tx_hash, 0)
-    };
-    let previous_output_cell = {
-        let script = Script::new_builder()
-            .args(lock_args.pack())
-            .code_hash(script_cell_data_hash)
-            .hash_type(ScriptHashType::Data.into())
-            .build();
-        CellOutput::new_builder()
-            .capacity(dummy_capacity.pack())
-            .lock(script)
-            .build()
-    };
-    let mut input_data = owner_lock_hash.as_bytes().to_vec();
-    input_data.push(signing_type.into());
-    input_data.extend_from_slice(&message);
-    dummy.cells.insert(
-        previous_out_point.clone(),
-        (previous_output_cell, input_data.into()),
-    );
-    tx_builder
-        .input(CellInput::new(previous_out_point, 0))
-        .input(CellInput::new(owner_lock_cell_out_point, 0))
-        .build()
-}
-
-fn sign_message(key: &Privkey, message: [u8; 32]) -> Bytes {
-    // calculate eth signing message
-    let message = {
-        let mut hasher = Keccak256::new();
-        hasher.update("\x19TRON Signed Message:\n32");
-        hasher.update(&message);
-        let buf = hasher.finalize();
-        let mut signing_message = [0u8; 32];
-        signing_message.copy_from_slice(&buf[..]);
-        ckb_types::H256::from(signing_message)
-    };
-    let sig = key.sign_recoverable(&message).expect("sign");
-    let mut signature = [0u8; 65];
-    signature.copy_from_slice(&sig.serialize());
-    if signature[64] == 1 {
-        signature[64] = 28;
-    }
-    signature.to_vec().into()
-}
-
-pub fn sha3_pubkey_hash(pubkey: &Pubkey) -> Bytes {
-    let mut hasher = Keccak256::new();
-    hasher.update(&pubkey.as_bytes());
-    let buf = hasher.finalize();
-    buf[12..].to_vec().into()
-}
-
-#[test]
-fn test_sign_tron_message() {
-    let mut data_loader = DummyDataLoader::default();
-    let privkey = Generator::random_privkey();
-    let pubkey = privkey.pubkey().expect("pubkey");
-    let pubkey_hash = sha3_pubkey_hash(&pubkey);
-    let mut rng = thread_rng();
-    let mut message = [0u8; 32];
-    rng.fill(&mut message);
-    let signature = sign_message(&privkey, message);
-    let lock_args = {
-        let rollup_script_hash = [42u8; 32];
-        let mut args = rollup_script_hash.to_vec();
-        args.extend_from_slice(&pubkey_hash);
-        args.into()
-    };
-    let tx = gen_tx(
-        &mut data_loader,
-        lock_args,
-        SigningType::WithPrefix,
-        message.to_vec().into(),
-    );
-    let tx = tx
-        .as_advanced_builder()
-        .set_witnesses(vec![WitnessArgs::new_builder()
-            .lock(Some(signature).pack())
-            .build()
-            .as_bytes()
-            .pack()])
-        .build();
-    let resolved_tx = build_resolved_tx(&data_loader, &tx);
-    let mut verifier = TransactionScriptsVerifier::new(&resolved_tx, &data_loader);
-    verifier.set_debug_printer(|_script, msg| println!("[script debug] {}", msg));
-    let verify_result = verifier.verify(MAX_CYCLES);
-    verify_result.expect("pass verification");
-}
-
-#[test]
-fn test_submit_signing_tron_message() {
-    let mut data_loader = DummyDataLoader::default();
-    let privkey = Generator::random_privkey();
-    let pubkey = privkey.pubkey().expect("pubkey");
-    let pubkey_hash = sha3_pubkey_hash(&pubkey);
-    let mut rng = thread_rng();
-    let mut message = [0u8; 32];
-    rng.fill(&mut message);
-    let signature = sign_message(&privkey, message);
-    let lock_args = {
-        let rollup_script_hash = [42u8; 32];
-        let mut args = rollup_script_hash.to_vec();
-        args.extend_from_slice(&pubkey_hash);
-        args.into()
-    };
-    let signing_message: [u8; 32] = {
-        let mut hasher = Keccak256::new();
-        hasher.update("\x19TRON Signed Message:\n32");
-        hasher.update(&message);
-        let buf = hasher.finalize();
-        buf.to_vec().try_into().unwrap()
-    };
-    let tx = gen_tx(
-        &mut data_loader,
-        lock_args,
-        SigningType::Raw,
-        signing_message.to_vec().into(),
-    );
-    let tx = tx
-        .as_advanced_builder()
-        .set_witnesses(vec![WitnessArgs::new_builder()
-            .lock(Some(signature).pack())
-            .build()
-            .as_bytes()
-            .pack()])
-        .build();
-    let resolved_tx = build_resolved_tx(&data_loader, &tx);
-    let mut verifier = TransactionScriptsVerifier::new(&resolved_tx, &data_loader);
-    verifier.set_debug_printer(|_script, msg| println!("[script debug] {}", msg));
-    let verify_result = verifier.verify(MAX_CYCLES);
-    verify_result.expect("pass verification");
-}
-
-#[test]
-fn test_wrong_signature() {
-    let mut data_loader = DummyDataLoader::default();
-    let privkey = Generator::random_privkey();
-    let pubkey = privkey.pubkey().expect("pubkey");
-    let pubkey_hash = sha3_pubkey_hash(&pubkey);
-    let lock_args = {
-        let rollup_script_hash = [42u8; 32];
-        let mut args = rollup_script_hash.to_vec();
-        args.extend_from_slice(&pubkey_hash);
-        args.into()
-    };
-    let mut rng = thread_rng();
-    let mut message = [0u8; 32];
-    rng.fill(&mut message);
-    let signature = {
-        let mut wrong_message = [0u8; 32];
-        rng.fill(&mut wrong_message);
-        sign_message(&privkey, wrong_message)
-    };
-    let tx = gen_tx(
-        &mut data_loader,
-        lock_args,
-        SigningType::Raw,
-        message.to_vec().into(),
-    );
-    let tx = tx
-        .as_advanced_builder()
-        .set_witnesses(vec![WitnessArgs::new_builder()
-            .lock(Some(signature).pack())
-            .build()
-            .as_bytes()
-            .pack()])
-        .build();
-    let resolved_tx = build_resolved_tx(&data_loader, &tx);
-    let mut verifier = TransactionScriptsVerifier::new(&resolved_tx, &data_loader);
-    verifier.set_debug_printer(|_script, msg| println!("[script debug] {}", msg));
-    let verify_result = verifier.verify(MAX_CYCLES);
-    let script_cell_index = 0;
-    assert_error_eq!(
-        verify_result.unwrap_err(),
-        ScriptError::ValidationFailure(
-            format!(
-                "by-data-hash/{}",
-                ckb_types::H256(*TRON_ACCOUNT_LOCK_CODE_HASH)
-            ),
-            ERROR_WRONG_SIGNATURE
-        )
-        .input_lock_script(script_cell_index)
-    );
-}
diff --git a/crates/tests/src/script_tests/custodian_lock.rs b/crates/tests/src/script_tests/custodian_lock.rs
index 198516aed..76d1466e0 100644
--- a/crates/tests/src/script_tests/custodian_lock.rs
+++ b/crates/tests/src/script_tests/custodian_lock.rs
@@ -24,8 +24,8 @@ struct CaseParam {
     finalized_block_number: u64,
     // GlobalState.last_finalized_timepoint
     finalized_block_timestamp: u64,
-    // CustodianLockArgs.deposit_block_timepoint
-    deposit_block_timepoint: Timepoint,
+    // CustodianLockArgs.deposit_finalized_timepoint
+    deposit_finalized_timepoint: Timepoint,
     // expected running result of the test case, Ok(()) or Err(exit_code)
     expected_result: Result<(), i8>,
 }
@@ -49,7 +49,7 @@ fn test_finality_of_custodian_lock() {
             id: 0,
             finalized_block_number,
             finalized_block_timestamp,
-            deposit_block_timepoint: finalized_timepoint_by_block_number,
+            deposit_finalized_timepoint: finalized_timepoint_by_block_number,
             expected_result: Ok(()),
         },
         CaseParam {
@@ -57,7 +57,7 @@ fn test_finality_of_custodian_lock() {
             id: 1,
             finalized_block_number,
             finalized_block_timestamp,
-            deposit_block_timepoint: unfinalized_timepoint_by_block_number,
+            deposit_finalized_timepoint: unfinalized_timepoint_by_block_number,
             expected_result: Err(INDEX_OUT_OF_BOUND_EXIT_CODE),
         },
         CaseParam {
@@ -65,7 +65,7 @@ fn test_finality_of_custodian_lock() {
             id: 2,
             finalized_block_number,
             finalized_block_timestamp,
-            deposit_block_timepoint: finalized_timepoint_by_block_timestamp,
+            deposit_finalized_timepoint: finalized_timepoint_by_block_timestamp,
             expected_result: Ok(()),
         },
         CaseParam {
@@ -73,7 +73,7 @@ fn test_finality_of_custodian_lock() {
             id: 3,
             finalized_block_number,
             finalized_block_timestamp,
-            deposit_block_timepoint: unfinalized_timepoint_by_block_timestamp,
+            deposit_finalized_timepoint: unfinalized_timepoint_by_block_timestamp,
             expected_result: Err(INDEX_OUT_OF_BOUND_EXIT_CODE),
         },
     ];
@@ -86,7 +86,7 @@ fn run_case(case: CaseParam) {
         id: _id,
         finalized_block_number,
         finalized_block_timestamp,
-        deposit_block_timepoint,
+        deposit_finalized_timepoint,
         expected_result,
     } = case;
     let rollup_config = default_rollup_config();
@@ -129,7 +129,9 @@ fn run_case(case: CaseParam) {
                 .hash_type(ScriptHashType::Type.into())
                 .args({
                     let custodian_lock_args = CustodianLockArgs::new_builder()
-                        .deposit_block_timepoint(deposit_block_timepoint.full_value().pack())
+                        .deposit_finalized_timepoint(
+                            deposit_finalized_timepoint.full_value().pack(),
+                        )
                         .build();
                     let mut args = Vec::new();
                     args.extend_from_slice(rollup_state_type_hash.as_slice());
@@ -185,7 +187,7 @@ fn run_case(case: CaseParam) {
 // Build common-used cells for testing custodian-lock:
 //   - rollup_config_cell, finality_blocks = ROLLUP_CONFIG_FINALITY_BLOCKS
 //   - rollup_code_cell, is ALWAYS_SUCCESS_PROGRAM, we won't use it
-//   - rollup_state_cell, last_finalized_block_number = ROLLUP_STATE_LAST_FINALIZED_BLOCK_NUMBER
+//   - rollup_state_cell, last_finalized_timepoint = ROLLUP_STATE_LAST_FINALIZED_BLOCK_NUMBER
 //   - custodian_code_cell, is CUSTODIAN_LOCK_PROGRAM
 //
 // Return (ctx, rollup_state_out_point, custodian_code_out_point);
diff --git a/crates/tests/src/script_tests/l2_scripts/examples.rs b/crates/tests/src/script_tests/l2_scripts/examples.rs
index 1f84367da..ba52ccd11 100644
--- a/crates/tests/src/script_tests/l2_scripts/examples.rs
+++ b/crates/tests/src/script_tests/l2_scripts/examples.rs
@@ -7,10 +7,8 @@ use super::{
     ACCOUNT_OP_PROGRAM_PATH, GW_LOG_SUDT_TRANSFER, RECOVER_PROGRAM_CODE_HASH, RECOVER_PROGRAM_PATH,
     SUDT_TOTAL_SUPPLY_PROGRAM_CODE_HASH, SUM_PROGRAM_CODE_HASH, SUM_PROGRAM_PATH,
 };
-use gw_common::smt::SMT;
 use gw_common::{
-    builtins::ETH_REGISTRY_ACCOUNT_ID, h256_ext::H256Ext, registry_address::RegistryAddress,
-    state::State, H256,
+    builtins::ETH_REGISTRY_ACCOUNT_ID, registry_address::RegistryAddress, state::State,
 };
 use gw_config::{BackendConfig, BackendForkConfig, BackendType};
 use gw_generator::backend_manage::BackendManage;
@@ -23,6 +21,7 @@ use gw_generator::{
     traits::StateExt,
     Generator,
 };
+use gw_smt::smt::{SMT, SMTH256};
 use gw_store::smt::smt_store::SMTStateStore;
 use gw_store::snapshot::StoreSnapshot;
 use gw_store::state::overlay::mem_state::MemStateTree;
@@ -35,6 +34,7 @@ use gw_types::packed::AllowedTypeHash;
 use gw_types::{
     bytes::Bytes,
     core::ScriptHashType,
+    h256::*,
     packed::{RawL2Transaction, RollupConfig, Script},
     prelude::*,
     U256,
@@ -42,7 +42,7 @@ use gw_types::{
 use gw_utils::RollupContext;
 
 fn new_state(store: StoreSnapshot) -> MemStateDB {
-    let smt = SMT::new(H256::zero(), SMTStateStore::new(MemStore::new(store)));
+    let smt = SMT::new(SMTH256::zero(), SMTStateStore::new(MemStore::new(store)));
     let inner = MemStateTree::new(smt, 0);
     MemStateDB::new(inner)
 }
@@ -62,7 +62,7 @@ fn test_example_sum() {
         .expect("create account");
     tree.mapping_registry_address_to_script_hash(
         RegistryAddress::new(ETH_REGISTRY_ACCOUNT_ID, vec![42u8; 20]),
-        sender_script.hash().into(),
+        sender_script.hash(),
     )
     .unwrap();
     let init_value: u64 = 0;
@@ -95,7 +95,7 @@ fn test_example_sum() {
             .register_lock_algorithm(H256::zero(), Arc::new(AlwaysSuccess::default()));
         let rollup_context = RollupContext {
             rollup_config: Default::default(),
-            rollup_script_hash: [42u8; 32].into(),
+            rollup_script_hash: [42u8; 32],
             ..Default::default()
         };
         let generator = Generator::new(
@@ -204,7 +204,7 @@ fn test_example_account_operation() {
         .expect("create account");
     tree.mapping_registry_address_to_script_hash(
         RegistryAddress::new(ETH_REGISTRY_ACCOUNT_ID, vec![42u8; 20]),
-        sender_script.hash().into(),
+        sender_script.hash(),
     )
     .unwrap();
 
@@ -240,7 +240,7 @@ fn test_example_account_operation() {
                 .pack(),
             )
             .build(),
-        rollup_script_hash: [42u8; 32].into(),
+        rollup_script_hash: [42u8; 32],
         ..Default::default()
     };
     let generator = Generator::new(
@@ -441,7 +441,7 @@ fn test_example_recover_account() {
         .expect("create account");
     tree.mapping_registry_address_to_script_hash(
         RegistryAddress::new(ETH_REGISTRY_ACCOUNT_ID, vec![42u8; 20]),
-        sender_script.hash().into(),
+        sender_script.hash(),
     )
     .unwrap();
 
@@ -469,7 +469,7 @@ fn test_example_recover_account() {
     let secp256k1_code_hash = H256::from_u32(11);
     account_lock_manage
         .register_lock_algorithm(secp256k1_code_hash, Arc::new(Secp256k1Eth::default()));
-    let rollup_script_hash: H256 = [42u8; 32].into();
+    let rollup_script_hash: H256 = [42u8; 32];
     let rollup_context = RollupContext {
         rollup_config: RollupConfig::new_builder()
             .allowed_contract_type_hashes(
@@ -602,7 +602,7 @@ fn test_sudt_total_supply() {
         .args([1u8; 32].to_vec().pack())
         .hash_type(ScriptHashType::Type.into())
         .build();
-    let alice_hash: H256 = alice.hash().into();
+    let alice_hash: H256 = alice.hash();
     let eth_registry_id = gw_common::builtins::ETH_REGISTRY_ACCOUNT_ID;
     let alice_address = RegistryAddress::new(eth_registry_id, alice_hash.as_slice().to_vec());
     let alice_id = tree
@@ -616,7 +616,7 @@ fn test_sudt_total_supply() {
         .args([2u8; 32].to_vec().pack())
         .hash_type(ScriptHashType::Type.into())
         .build();
-    let bob_hash: H256 = bob.hash().into();
+    let bob_hash: H256 = bob.hash();
     let bob_address = RegistryAddress::new(eth_registry_id, bob_hash.as_slice().to_vec());
     tree.create_account_from_script(bob)
         .expect("create bob account");
@@ -647,12 +647,12 @@ fn test_sudt_total_supply() {
         .unwrap();
         let mut account_lock_manage = AccountLockManage::default();
         account_lock_manage.register_lock_algorithm(
-            (*ALWAYS_SUCCESS_CODE_HASH).into(),
+            *ALWAYS_SUCCESS_CODE_HASH,
             Arc::new(AlwaysSuccess::default()),
         );
         let rollup_context = RollupContext {
             rollup_config,
-            rollup_script_hash: [42u8; 32].into(),
+            rollup_script_hash: [42u8; 32],
             ..Default::default()
         };
         let generator = Generator::new(
diff --git a/crates/tests/src/script_tests/l2_scripts/meta_contract.rs b/crates/tests/src/script_tests/l2_scripts/meta_contract.rs
index d316885f8..d0e123650 100644
--- a/crates/tests/src/script_tests/l2_scripts/meta_contract.rs
+++ b/crates/tests/src/script_tests/l2_scripts/meta_contract.rs
@@ -6,7 +6,6 @@ use crate::testing_tool::chain::ALWAYS_SUCCESS_CODE_HASH;
 use gw_common::{
     builtins::{CKB_SUDT_ACCOUNT_ID, RESERVED_ACCOUNT_ID},
     state::State,
-    H256,
 };
 use gw_generator::{
     error::TransactionError, syscalls::error_codes::GW_ERROR_DUPLICATED_SCRIPT_HASH,
@@ -15,6 +14,7 @@ use gw_generator::{
 use gw_types::U256;
 use gw_types::{
     core::ScriptHashType,
+    h256::*,
     packed::{CreateAccount, Fee, MetaContractArgs, Script},
     prelude::*,
 };
@@ -33,7 +33,7 @@ fn test_meta_contract() {
         .state
         .create_account_from_script(a_script)
         .expect("create account");
-    let a_address = ctx.create_eth_address(a_script_hash.into(), [1u8; 20]);
+    let a_address = ctx.create_eth_address(a_script_hash, [1u8; 20]);
     ctx.state
         .mint_sudt(CKB_SUDT_ACCOUNT_ID, &a_address, U256::from(2000u64))
         .expect("mint CKB for account A to pay fee");
@@ -85,7 +85,7 @@ fn test_meta_contract() {
     assert_ne!(script_hash, H256::zero(), "script hash must exists");
     assert_eq!(
         script_hash,
-        contract_script.hash().into(),
+        contract_script.hash(),
         "script hash must according to create account"
     );
 }
@@ -105,7 +105,7 @@ fn test_duplicated_script_hash() {
         .state
         .create_account_from_script(a_script)
         .expect("create account");
-    let a_address = ctx.create_eth_address(a_script_hash.into(), [1u8; 20]);
+    let a_address = ctx.create_eth_address(a_script_hash, [1u8; 20]);
 
     ctx.state
         .mint_sudt(CKB_SUDT_ACCOUNT_ID, &a_address, U256::from(1000u64))
@@ -165,7 +165,7 @@ fn test_insufficient_balance_to_pay_fee() {
         .state
         .create_account_from_script(from_script)
         .expect("create account");
-    let from_address = ctx.create_eth_address(from_script_hash.into(), [1u8; 20]);
+    let from_address = ctx.create_eth_address(from_script_hash, [1u8; 20]);
 
     // create contract
     let contract_script = Script::new_builder()
diff --git a/crates/tests/src/script_tests/l2_scripts/mod.rs b/crates/tests/src/script_tests/l2_scripts/mod.rs
index 8774ee66a..e4fcff977 100644
--- a/crates/tests/src/script_tests/l2_scripts/mod.rs
+++ b/crates/tests/src/script_tests/l2_scripts/mod.rs
@@ -3,11 +3,11 @@ use gw_common::blake2b::new_blake2b;
 use gw_common::builtins::CKB_SUDT_ACCOUNT_ID;
 use gw_common::registry_address::RegistryAddress;
 use gw_common::state::State;
-use gw_common::H256;
 use gw_generator::error::TransactionError;
 use gw_generator::{account_lock_manage::AccountLockManage, Generator};
 use gw_store::state::traits::JournalDB;
 use gw_traits::{ChainView, CodeStore};
+use gw_types::h256::*;
 use gw_types::U256;
 use gw_types::{
     bytes::Bytes,
@@ -245,7 +245,7 @@ pub fn run_contract_get_result<S: State + CodeStore + JournalDB>(
     let account_lock_manage = AccountLockManage::default();
     let rollup_ctx = RollupContext {
         rollup_config: rollup_config.clone(),
-        rollup_script_hash: [42u8; 32].into(),
+        rollup_script_hash: [42u8; 32],
         ..Default::default()
     };
     let generator = Generator::new(
diff --git a/crates/tests/src/script_tests/programs.rs b/crates/tests/src/script_tests/programs.rs
index 5a5525475..ee635a123 100644
--- a/crates/tests/src/script_tests/programs.rs
+++ b/crates/tests/src/script_tests/programs.rs
@@ -18,7 +18,6 @@ const META_CONTRACT_BIN_NAME: &str = "meta-contract-validator";
 const ETH_ADDR_REG_BIN_NAME: &str = "eth-addr-reg-generator";
 // account locks
 const ETH_LOCK_PATH: &str = "eth-account-lock";
-const TRON_LOCK_PATH: &str = "tron-account-lock";
 
 lazy_static! {
     pub static ref CHALLENGE_LOCK_PROGRAM: Bytes = {
@@ -102,22 +101,6 @@ lazy_static! {
         hasher.finalize(&mut buf);
         buf
     };
-    pub static ref TRON_ACCOUNT_LOCK_PROGRAM: Bytes = {
-        let mut buf = Vec::new();
-        let mut path = PathBuf::new();
-        path.push(&SCRIPT_DIR);
-        path.push(&TRON_LOCK_PATH);
-        let mut f = fs::File::open(&path).expect("load program");
-        f.read_to_end(&mut buf).expect("read program");
-        Bytes::from(buf.to_vec())
-    };
-    pub static ref TRON_ACCOUNT_LOCK_CODE_HASH: [u8; 32] = {
-        let mut buf = [0u8; 32];
-        let mut hasher = new_blake2b();
-        hasher.update(&TRON_ACCOUNT_LOCK_PROGRAM);
-        hasher.finalize(&mut buf);
-        buf
-    };
     pub static ref SECP256K1_DATA: Bytes = {
         let mut buf = Vec::new();
         let mut f = fs::File::open(&SECP256K1_DATA_PATH).expect("load secp256k1 data");
diff --git a/crates/tests/src/script_tests/stake_lock.rs b/crates/tests/src/script_tests/stake_lock.rs
index 2a26020a8..e6290a02f 100644
--- a/crates/tests/src/script_tests/stake_lock.rs
+++ b/crates/tests/src/script_tests/stake_lock.rs
@@ -25,8 +25,8 @@ struct CaseParam {
     finalized_block_number: u64,
     // GlobalState.last_finalized_timepoint
     finalized_block_timestamp: u64,
-    // StakeLockArgs.stake_block_timepoint
-    stake_block_timepoint: Timepoint,
+    // StakeLockArgs.stake_finalized_timepoint
+    stake_finalized_timepoint: Timepoint,
     // expected running result of the test case, Ok(()) or Err(exit_code)
     expected_result: Result<(), i8>,
 }
@@ -50,7 +50,7 @@ fn test_finality_of_stake_lock() {
             id: 0,
             finalized_block_number,
             finalized_block_timestamp,
-            stake_block_timepoint: finalized_timepoint_by_block_number,
+            stake_finalized_timepoint: finalized_timepoint_by_block_number,
             expected_result: Ok(()),
         },
         CaseParam {
@@ -58,7 +58,7 @@ fn test_finality_of_stake_lock() {
             id: 1,
             finalized_block_number,
             finalized_block_timestamp,
-            stake_block_timepoint: unfinalized_timepoint_by_block_number,
+            stake_finalized_timepoint: unfinalized_timepoint_by_block_number,
             expected_result: Err(INVALID_STAKE_CELL_UNLOCK_EXIT_CODE),
         },
         CaseParam {
@@ -66,7 +66,7 @@ fn test_finality_of_stake_lock() {
             id: 2,
             finalized_block_number,
             finalized_block_timestamp,
-            stake_block_timepoint: finalized_timepoint_by_block_timestamp,
+            stake_finalized_timepoint: finalized_timepoint_by_block_timestamp,
             expected_result: Ok(()),
         },
         CaseParam {
@@ -74,7 +74,7 @@ fn test_finality_of_stake_lock() {
             id: 3,
             finalized_block_number,
             finalized_block_timestamp,
-            stake_block_timepoint: unfinalized_timepoint_by_block_timestamp,
+            stake_finalized_timepoint: unfinalized_timepoint_by_block_timestamp,
             expected_result: Err(INVALID_STAKE_CELL_UNLOCK_EXIT_CODE),
         },
     ];
@@ -87,7 +87,7 @@ fn run_case(case: CaseParam) {
         id: _id,
         finalized_block_number,
         finalized_block_timestamp,
-        stake_block_timepoint,
+        stake_finalized_timepoint,
         expected_result,
     } = case;
     let rollup_config = default_rollup_config();
@@ -136,7 +136,7 @@ fn run_case(case: CaseParam) {
                 .args({
                     let stake_lock_args = StakeLockArgs::new_builder()
                         .owner_lock_hash(Byte32::new_unchecked(stake_owner_lock_hash.as_bytes()))
-                        .stake_block_timepoint(stake_block_timepoint.full_value().pack())
+                        .stake_finalized_timepoint(stake_finalized_timepoint.full_value().pack())
                         .build();
                     let mut args = Vec::new();
                     args.extend_from_slice(rollup_state_type_hash.as_slice());
@@ -196,7 +196,7 @@ fn run_case(case: CaseParam) {
 // Build common-used cells for testing stake-lock:
 //   - rollup_config_cell, finality_blocks = ROLLUP_CONFIG_FINALITY_BLOCKS
 //   - rollup_code_cell, is ALWAYS_SUCCESS_PROGRAM
-//   - rollup_state_cell, last_finalized_block_number = ROLLUP_STATE_LAST_FINALIZED_BLOCK_NUMBER
+//   - rollup_state_cell, last_finalized_timepoint = ROLLUP_STATE_LAST_FINALIZED_BLOCK_NUMBER
 //   - stake_code_cell, is STAKE_LOCK_PROGRAM
 //   - stake_owner_cell, is ALWAYS_SUCCESS_PROGRAM
 //
diff --git a/crates/tests/src/script_tests/state_validator/cancel_challenge/mod.rs b/crates/tests/src/script_tests/state_validator/cancel_challenge/mod.rs
index 2dc56e060..8eb56b8cf 100644
--- a/crates/tests/src/script_tests/state_validator/cancel_challenge/mod.rs
+++ b/crates/tests/src/script_tests/state_validator/cancel_challenge/mod.rs
@@ -22,7 +22,6 @@ use gw_common::builtins::ETH_REGISTRY_ACCOUNT_ID;
 use gw_common::merkle_utils::ckb_merkle_leaf_hash;
 use gw_common::merkle_utils::CBMT;
 use gw_common::state::State;
-use gw_common::H256;
 use gw_generator::account_lock_manage::always_success::AlwaysSuccess;
 use gw_generator::account_lock_manage::eip712::{
     traits::EIP712Encode,
@@ -34,6 +33,7 @@ use gw_store::state::traits::JournalDB;
 use gw_store::state::MemStateDB;
 use gw_types::core::AllowedEoaType;
 use gw_types::core::SigningType;
+use gw_types::h256::*;
 use gw_types::packed::AllowedTypeHash;
 use gw_types::packed::CCWithdrawalWitness;
 use gw_types::packed::WithdrawalRequestExtra;
@@ -100,7 +100,7 @@ async fn test_burn_challenge_capacity() {
         .build();
     // setup chain
     let mut account_lock_manage = AccountLockManage::default();
-    account_lock_manage.register_lock_algorithm(eoa_lock_type_hash.into(), Arc::new(AlwaysSuccess));
+    account_lock_manage.register_lock_algorithm(eoa_lock_type_hash, Arc::new(AlwaysSuccess));
     let mut chain = setup_chain_with_account_lock_manage(
         rollup_type_script.clone(),
         rollup_config.clone(),
@@ -308,11 +308,11 @@ async fn test_burn_challenge_capacity() {
 
     tree.set_state_tracker(Default::default());
     let withdrawal_address = tree
-        .get_registry_address_by_script_hash(ETH_REGISTRY_ACCOUNT_ID, &sender_script.hash().into())
+        .get_registry_address_by_script_hash(ETH_REGISTRY_ACCOUNT_ID, &sender_script.hash())
         .unwrap()
         .unwrap();
     let sender_id = tree
-        .get_account_id_by_script_hash(&sender_script.hash().into())
+        .get_account_id_by_script_hash(&sender_script.hash())
         .unwrap()
         .unwrap();
     tree.get_script_hash(sender_id).unwrap();
@@ -334,9 +334,10 @@ async fn test_burn_challenge_capacity() {
     let kv_state_proof: Bytes = {
         let db = chain.store().begin_transaction();
         let smt = SMTStateStore::new(&db).to_smt().unwrap();
-        smt.merkle_proof(touched_keys.clone())
+        let smt_touched_keys: Vec<_> = touched_keys.iter().map(|k| (*k).into()).collect();
+        smt.merkle_proof(smt_touched_keys.clone())
             .unwrap()
-            .compile(touched_keys)
+            .compile(smt_touched_keys)
             .unwrap()
             .0
             .into()
@@ -349,7 +350,7 @@ async fn test_burn_challenge_capacity() {
                 .into_iter()
                 .enumerate()
                 .map(|(idx, withdrawal)| {
-                    let hash: H256 = withdrawal.witness_hash().into();
+                    let hash: H256 = withdrawal.witness_hash();
                     ckb_merkle_leaf_hash(idx as u32, &hash)
                 })
                 .collect();
diff --git a/crates/tests/src/script_tests/state_validator/cancel_challenge/tx_execution.rs b/crates/tests/src/script_tests/state_validator/cancel_challenge/tx_execution.rs
index 934aebb19..8ec87e6d0 100644
--- a/crates/tests/src/script_tests/state_validator/cancel_challenge/tx_execution.rs
+++ b/crates/tests/src/script_tests/state_validator/cancel_challenge/tx_execution.rs
@@ -20,7 +20,7 @@ use ckb_types::{
 use gw_common::builtins::ETH_REGISTRY_ACCOUNT_ID;
 use gw_common::merkle_utils::ckb_merkle_leaf_hash;
 use gw_common::registry_address::RegistryAddress;
-use gw_common::{state::State, H256};
+use gw_common::state::State;
 use gw_store::smt::smt_store::SMTStateStore;
 use gw_store::state::history::history_state::RWConfig;
 use gw_store::state::traits::JournalDB;
@@ -28,6 +28,7 @@ use gw_store::state::{BlockStateDB, MemStateDB};
 use gw_traits::CodeStore;
 use gw_types::core::AllowedContractType;
 use gw_types::core::AllowedEoaType;
+use gw_types::h256::*;
 use gw_types::packed::AllowedTypeHash;
 use gw_types::packed::CCTransactionWitness;
 use gw_types::packed::Fee;
@@ -158,7 +159,7 @@ async fn test_cancel_tx_execute() {
         let db = chain.store().begin_transaction();
         let tree = BlockStateDB::from_store(&db, RWConfig::readonly()).unwrap();
         let sender_id = tree
-            .get_account_id_by_script_hash(&sender_script.hash().into())
+            .get_account_id_by_script_hash(&sender_script.hash())
             .unwrap()
             .unwrap();
         let sudt_script_hash = tree.get_script_hash(sudt_id).unwrap();
@@ -269,7 +270,7 @@ async fn test_cancel_tx_execute() {
                 .transactions()
                 .into_iter()
                 .enumerate()
-                .map(|(idx, tx)| ckb_merkle_leaf_hash(idx as u32, &tx.witness_hash().into()))
+                .map(|(idx, tx)| ckb_merkle_leaf_hash(idx as u32, &tx.witness_hash()))
                 .collect();
             let tx_proof = super::build_merkle_proof(&leaves, &[challenge_target_index]);
             let challenged_block_number =
@@ -289,13 +290,13 @@ async fn test_cancel_tx_execute() {
             let mut tree = MemStateDB::from_store(chain.store().get_snapshot()).unwrap();
             tree.set_state_tracker(Default::default());
             let sender_id = tree
-                .get_account_id_by_script_hash(&sender_script.hash().into())
+                .get_account_id_by_script_hash(&sender_script.hash())
                 .unwrap()
                 .unwrap();
             tree.get_script_hash(sender_id).unwrap();
             tree.get_nonce(sender_id).unwrap();
             let receiver_id = tree
-                .get_account_id_by_script_hash(&receiver_script.hash().into())
+                .get_account_id_by_script_hash(&receiver_script.hash())
                 .unwrap()
                 .unwrap();
             tree.get_script_hash(receiver_id).unwrap();
@@ -303,7 +304,7 @@ async fn test_cancel_tx_execute() {
             tree.get_script_hash(sudt_id).unwrap();
             tree.get_registry_address_by_script_hash(
                 ETH_REGISTRY_ACCOUNT_ID,
-                &sender_script.hash().into(),
+                &sender_script.hash(),
             )
             .unwrap()
             .expect("get sender address");
@@ -323,9 +324,10 @@ async fn test_cancel_tx_execute() {
 
             let kv_state_proof: Bytes = {
                 let smt = SMTStateStore::new(&db).to_smt().unwrap();
-                smt.merkle_proof(touched_keys.clone())
+                let smt_touched_keys: Vec<_> = touched_keys.iter().map(|k| (*k).into()).collect();
+                smt.merkle_proof(smt_touched_keys.clone())
                     .unwrap()
-                    .compile(touched_keys)
+                    .compile(smt_touched_keys)
                     .unwrap()
                     .0
                     .into()
diff --git a/crates/tests/src/script_tests/state_validator/cancel_challenge/tx_signature.rs b/crates/tests/src/script_tests/state_validator/cancel_challenge/tx_signature.rs
index a8a56a072..9da2fa9ed 100644
--- a/crates/tests/src/script_tests/state_validator/cancel_challenge/tx_signature.rs
+++ b/crates/tests/src/script_tests/state_validator/cancel_challenge/tx_signature.rs
@@ -21,7 +21,7 @@ use ckb_types::{
 use gw_common::builtins::ETH_REGISTRY_ACCOUNT_ID;
 use gw_common::merkle_utils::ckb_merkle_leaf_hash;
 use gw_common::registry_address::RegistryAddress;
-use gw_common::{state::State, H256};
+use gw_common::state::State;
 use gw_generator::account_lock_manage::always_success::AlwaysSuccess;
 use gw_generator::account_lock_manage::eip712;
 use gw_generator::account_lock_manage::eip712::traits::EIP712Encode;
@@ -36,6 +36,7 @@ use gw_traits::CodeStore;
 use gw_types::core::AllowedContractType;
 use gw_types::core::AllowedEoaType;
 use gw_types::core::SigningType;
+use gw_types::h256::*;
 use gw_types::packed::AllowedTypeHash;
 use gw_types::packed::CCTransactionSignatureWitness;
 use gw_types::packed::Fee;
@@ -96,7 +97,7 @@ async fn test_cancel_tx_signature() {
         .build();
     // setup chain
     let mut account_lock_manage = AccountLockManage::default();
-    account_lock_manage.register_lock_algorithm(eoa_lock_type_hash.into(), Arc::new(AlwaysSuccess));
+    account_lock_manage.register_lock_algorithm(eoa_lock_type_hash, Arc::new(AlwaysSuccess));
     let mut chain = setup_chain_with_account_lock_manage(
         rollup_type_script.clone(),
         rollup_config.clone(),
@@ -183,7 +184,7 @@ async fn test_cancel_tx_signature() {
         let db = chain.store().begin_transaction();
         let tree = BlockStateDB::from_store(&db, RWConfig::readonly()).unwrap();
         let sender_id = tree
-            .get_account_id_by_script_hash(&sender_script.hash().into())
+            .get_account_id_by_script_hash(&sender_script.hash())
             .unwrap()
             .unwrap();
         let sudt_script_hash = tree.get_script_hash(sudt_id).unwrap();
@@ -296,7 +297,7 @@ async fn test_cancel_tx_signature() {
                 .transactions()
                 .into_iter()
                 .enumerate()
-                .map(|(idx, tx)| ckb_merkle_leaf_hash(idx as u32, &tx.witness_hash().into()))
+                .map(|(idx, tx)| ckb_merkle_leaf_hash(idx as u32, &tx.witness_hash()))
                 .collect();
             let tx_proof = super::build_merkle_proof(&leaves, &[challenge_target_index]);
             let challenged_block_number =
@@ -316,20 +317,17 @@ async fn test_cancel_tx_signature() {
             let mut tree = MemStateDB::from_store(chain.store().get_snapshot()).unwrap();
             tree.set_state_tracker(Default::default());
             let sender_id = tree
-                .get_account_id_by_script_hash(&sender_script.hash().into())
+                .get_account_id_by_script_hash(&sender_script.hash())
                 .unwrap()
                 .unwrap();
             sender_address = tree
-                .get_registry_address_by_script_hash(
-                    ETH_REGISTRY_ACCOUNT_ID,
-                    &sender_script.hash().into(),
-                )
+                .get_registry_address_by_script_hash(ETH_REGISTRY_ACCOUNT_ID, &sender_script.hash())
                 .unwrap()
                 .expect("get sender address");
             tree.get_script_hash(sender_id).unwrap();
             tree.get_nonce(sender_id).unwrap();
             let receiver_id = tree
-                .get_account_id_by_script_hash(&receiver_script.hash().into())
+                .get_account_id_by_script_hash(&receiver_script.hash())
                 .unwrap()
                 .unwrap();
             tree.get_script_hash(receiver_id).unwrap();
@@ -352,9 +350,10 @@ async fn test_cancel_tx_signature() {
 
             let kv_state_proof: Bytes = {
                 let smt = SMTStateStore::new(&db).to_smt().unwrap();
-                smt.merkle_proof(touched_keys.clone())
+                let smt_touched_keys: Vec<_> = touched_keys.iter().map(|k| (*k).into()).collect();
+                smt.merkle_proof(smt_touched_keys.clone())
                     .unwrap()
-                    .compile(touched_keys)
+                    .compile(smt_touched_keys)
                     .unwrap()
                     .0
                     .into()
@@ -387,7 +386,7 @@ async fn test_cancel_tx_signature() {
             let typed_tx = eip712::types::L2Transaction::from_raw(
                 &tx.raw(),
                 sender_address,
-                sudt_script.hash().into(),
+                sudt_script.hash(),
             )
             .unwrap();
             let domain_seperator = EIP712Domain {
diff --git a/crates/tests/src/script_tests/state_validator/cancel_challenge/withdrawal.rs b/crates/tests/src/script_tests/state_validator/cancel_challenge/withdrawal.rs
index ed7b5597b..275a24667 100644
--- a/crates/tests/src/script_tests/state_validator/cancel_challenge/withdrawal.rs
+++ b/crates/tests/src/script_tests/state_validator/cancel_challenge/withdrawal.rs
@@ -22,7 +22,6 @@ use ckb_types::{
 };
 use gw_common::builtins::ETH_REGISTRY_ACCOUNT_ID;
 use gw_common::state::State;
-use gw_common::H256;
 use gw_generator::account_lock_manage::{
     eip712::{
         traits::EIP712Encode,
@@ -35,6 +34,7 @@ use gw_store::state::traits::JournalDB;
 use gw_store::state::MemStateDB;
 use gw_types::core::AllowedEoaType;
 use gw_types::core::SigningType;
+use gw_types::h256::*;
 use gw_types::packed::AllowedTypeHash;
 use gw_types::packed::CCWithdrawalWitness;
 use gw_types::packed::WithdrawalRequestExtra;
@@ -80,7 +80,7 @@ async fn test_cancel_withdrawal() {
         .build();
     // setup chain
     let mut account_lock_manage = AccountLockManage::default();
-    account_lock_manage.register_lock_algorithm(eoa_lock_type_hash.into(), Arc::new(AlwaysSuccess));
+    account_lock_manage.register_lock_algorithm(eoa_lock_type_hash, Arc::new(AlwaysSuccess));
     let mut chain = setup_chain_with_account_lock_manage(
         rollup_type_script.clone(),
         rollup_config.clone(),
@@ -280,7 +280,7 @@ async fn test_cancel_withdrawal() {
     let mut tree = MemStateDB::from_store(chain.store().get_snapshot()).unwrap();
     tree.set_state_tracker(Default::default());
     let withdrawal_address = tree
-        .get_registry_address_by_script_hash(ETH_REGISTRY_ACCOUNT_ID, &sender_script.hash().into())
+        .get_registry_address_by_script_hash(ETH_REGISTRY_ACCOUNT_ID, &sender_script.hash())
         .unwrap()
         .unwrap();
     let account_count = tree.get_account_count().unwrap();
@@ -299,9 +299,10 @@ async fn test_cancel_withdrawal() {
     let kv_state_proof: Bytes = {
         let db = chain.store().begin_transaction();
         let smt = SMTStateStore::new(&db).to_smt().unwrap();
-        smt.merkle_proof(touched_keys.clone())
+        let smt_touched_keys: Vec<_> = touched_keys.iter().map(|k| (*k).into()).collect();
+        smt.merkle_proof(smt_touched_keys.clone())
             .unwrap()
-            .compile(touched_keys)
+            .compile(smt_touched_keys)
             .unwrap()
             .0
             .into()
@@ -312,7 +313,7 @@ async fn test_cancel_withdrawal() {
                 .withdrawals()
                 .into_iter()
                 .enumerate()
-                .map(|(_, withdrawal)| withdrawal.witness_hash().into())
+                .map(|(_, withdrawal)| withdrawal.witness_hash())
                 .collect();
             let proof = build_merkle_proof(&leaves, &[challenge_target_index]);
             // we do not actually execute the signature verification in this test
diff --git a/crates/tests/src/script_tests/state_validator/enter_challenge.rs b/crates/tests/src/script_tests/state_validator/enter_challenge.rs
index e3d4c0b29..b5c66d167 100644
--- a/crates/tests/src/script_tests/state_validator/enter_challenge.rs
+++ b/crates/tests/src/script_tests/state_validator/enter_challenge.rs
@@ -137,11 +137,11 @@ async fn test_enter_challenge() {
         let db = chain.store().begin_transaction();
         let tree = BlockStateDB::from_store(&db, RWConfig::readonly()).unwrap();
         let sender_id = tree
-            .get_account_id_by_script_hash(&sender_script.hash().into())
+            .get_account_id_by_script_hash(&sender_script.hash())
             .unwrap()
             .unwrap();
         let receiver_id = tree
-            .get_account_id_by_script_hash(&receiver_script.hash().into())
+            .get_account_id_by_script_hash(&receiver_script.hash())
             .unwrap()
             .unwrap();
         let receiver_script_hash = tree.get_script_hash(receiver_id).expect("get script hash");
@@ -374,7 +374,7 @@ async fn test_enter_challenge_finalized_block() {
         let db = chain.store().begin_transaction();
         let tree = BlockStateDB::from_store(&db, RWConfig::readonly()).unwrap();
         let sender_id = tree
-            .get_account_id_by_script_hash(&sender_script.hash().into())
+            .get_account_id_by_script_hash(&sender_script.hash())
             .unwrap()
             .unwrap();
         (sender_id, receiver_address)
diff --git a/crates/tests/src/script_tests/state_validator/revert.rs b/crates/tests/src/script_tests/state_validator/revert.rs
index eb891ecb1..6550719b8 100644
--- a/crates/tests/src/script_tests/state_validator/revert.rs
+++ b/crates/tests/src/script_tests/state_validator/revert.rs
@@ -19,10 +19,10 @@ use ckb_types::{
     prelude::{Pack as CKBPack, Unpack as CKBUnpack},
 };
 use gw_common::registry_address::RegistryAddress;
-use gw_common::{
-    builtins::CKB_SUDT_ACCOUNT_ID, h256_ext::H256Ext,
-    sparse_merkle_tree::default_store::DefaultStore, state::State, H256,
-};
+use gw_common::{builtins::CKB_SUDT_ACCOUNT_ID, state::State};
+use gw_smt::smt::SMTH256;
+use gw_smt::smt_h256_ext::SMTH256Ext;
+use gw_smt::sparse_merkle_tree::default_store::DefaultStore;
 use gw_store::state::history::history_state::RWConfig;
 use gw_store::state::BlockStateDB;
 use gw_store::traits::chain_store::ChainStore;
@@ -32,6 +32,7 @@ use gw_types::U256;
 use gw_types::{
     bytes::Bytes,
     core::{ChallengeTargetType, ScriptHashType, Status},
+    h256::*,
     packed::{
         ChallengeLockArgs, ChallengeTarget, DepositRequest, L2Transaction, RawL2Transaction,
         RollupAction, RollupActionUnion, RollupConfig, RollupRevert, SUDTArgs, SUDTArgsUnion,
@@ -154,7 +155,7 @@ async fn test_revert() {
         let db = chain.store().begin_transaction();
         let tree = BlockStateDB::from_store(&db, RWConfig::readonly()).unwrap();
         let sender_id = tree
-            .get_account_id_by_script_hash(&sender_script.hash().into())
+            .get_account_id_by_script_hash(&sender_script.hash())
             .unwrap()
             .unwrap();
         let receiver_address = RegistryAddress::new(1, receiver_script.hash()[0..20].to_vec());
@@ -289,7 +290,7 @@ async fn test_revert() {
         maybe_block.unwrap().unwrap().raw()
     };
     let new_tip_block_timestamp = new_tip_block.timestamp();
-    let mut reverted_block_tree: gw_common::smt::SMT<DefaultStore<H256>> = Default::default();
+    let mut reverted_block_tree: gw_smt::smt::SMT<DefaultStore<SMTH256>> = Default::default();
     // verify enter challenge
     let witness = {
         let block_proof: Bytes = {
@@ -328,11 +329,11 @@ async fn test_revert() {
             .output_type(CKBPack::pack(&Some(rollup_action.as_bytes())))
             .build()
     };
-    let post_reverted_block_root = {
+    let post_reverted_block_root: H256 = {
         reverted_block_tree
-            .update(challenged_block.hash().into(), H256::one())
+            .update(challenged_block.hash().into(), SMTH256::one())
             .unwrap();
-        *reverted_block_tree.root()
+        (*reverted_block_tree.root()).into()
     };
     let last_finalized_timepoint = {
         let number: u64 = challenged_block.raw().number().unpack();
diff --git a/crates/tests/src/script_tests/state_validator/submit_block.rs b/crates/tests/src/script_tests/state_validator/submit_block.rs
index 13612f280..12e33b08a 100644
--- a/crates/tests/src/script_tests/state_validator/submit_block.rs
+++ b/crates/tests/src/script_tests/state_validator/submit_block.rs
@@ -91,7 +91,7 @@ async fn test_submit_block() {
     };
     let output_stake_cell = {
         let lock_args = StakeLockArgs::new_builder()
-            .stake_block_timepoint(Pack::pack(&1))
+            .stake_finalized_timepoint(Pack::pack(&1))
             .build();
         build_rollup_locked_cell(
             &rollup_type_script.hash(),
@@ -211,7 +211,7 @@ async fn test_replace_rollup_cell_lock() {
     };
     let output_stake_cell = {
         let lock_args = StakeLockArgs::new_builder()
-            .stake_block_timepoint(Pack::pack(&1))
+            .stake_finalized_timepoint(Pack::pack(&1))
             .build();
         build_rollup_locked_cell(
             &rollup_type_script.hash(),
@@ -346,7 +346,7 @@ async fn test_downgrade_rollup_cell() {
     };
     let output_stake_cell = {
         let lock_args = StakeLockArgs::new_builder()
-            .stake_block_timepoint(Pack::pack(&1))
+            .stake_finalized_timepoint(Pack::pack(&1))
             .build();
         build_rollup_locked_cell(
             &rollup_type_script.hash(),
@@ -480,7 +480,7 @@ async fn test_v1_block_timestamp_smaller_or_equal_than_previous_block_in_submit_
     };
     let output_stake_cell = {
         let lock_args = StakeLockArgs::new_builder()
-            .stake_block_timepoint(Pack::pack(&1))
+            .stake_finalized_timepoint(Pack::pack(&1))
             .build();
         build_rollup_locked_cell(
             &rollup_type_script.hash(),
@@ -690,7 +690,7 @@ async fn test_v1_block_timestamp_bigger_than_rollup_input_since_in_submit_block(
     };
     let output_stake_cell = {
         let lock_args = StakeLockArgs::new_builder()
-            .stake_block_timepoint(Pack::pack(&1))
+            .stake_finalized_timepoint(Pack::pack(&1))
             .build();
         build_rollup_locked_cell(
             &rollup_type_script.hash(),
@@ -831,7 +831,7 @@ async fn test_v0_v1_wrong_global_state_tip_block_timestamp_in_submit_block() {
     };
     let output_stake_cell = {
         let lock_args = StakeLockArgs::new_builder()
-            .stake_block_timepoint(Pack::pack(&1))
+            .stake_finalized_timepoint(Pack::pack(&1))
             .build();
         build_rollup_locked_cell(
             &rollup_type_script.hash(),
@@ -1058,7 +1058,7 @@ async fn test_check_reverted_cells_in_submit_block() {
     };
     let output_stake_cell = {
         let lock_args = StakeLockArgs::new_builder()
-            .stake_block_timepoint(Pack::pack(&1))
+            .stake_finalized_timepoint(Pack::pack(&1))
             .build();
         build_rollup_locked_cell(
             &rollup_type_script.hash(),
@@ -1101,7 +1101,7 @@ async fn test_check_reverted_cells_in_submit_block() {
         let args = CustodianLockArgs::new_builder()
             .deposit_lock_args(deposit_args.clone())
             .deposit_block_hash(Pack::pack(&revert_block_hash))
-            .deposit_block_timepoint(Pack::pack(&revert_block_number))
+            .deposit_finalized_timepoint(Pack::pack(&revert_block_number))
             .build();
         let cell = build_rollup_locked_cell(
             &rollup_type_script.hash(),
@@ -1126,7 +1126,7 @@ async fn test_check_reverted_cells_in_submit_block() {
         let owner_lock = Script::default();
         let lock_args = WithdrawalLockArgs::new_builder()
             .withdrawal_block_hash(Pack::pack(&revert_block_hash))
-            .withdrawal_block_timepoint(Pack::pack(&revert_block_number))
+            .withdrawal_finalized_timepoint(Pack::pack(&revert_block_number))
             .owner_lock_hash(Pack::pack(&owner_lock.hash()))
             .build();
         let mut args = Vec::new();
@@ -1145,7 +1145,7 @@ async fn test_check_reverted_cells_in_submit_block() {
     let output_reverted_custodian_cell = {
         let args = CustodianLockArgs::new_builder()
             .deposit_block_hash(Pack::pack(&[0u8; 32]))
-            .deposit_block_timepoint(Pack::pack(&0))
+            .deposit_finalized_timepoint(Pack::pack(&0))
             .build();
         build_rollup_locked_cell(
             &rollup_type_script.hash(),
@@ -1163,7 +1163,7 @@ async fn test_check_reverted_cells_in_submit_block() {
             .map(|_| {
                 let args = CustodianLockArgs::new_builder()
                     .deposit_block_hash(Pack::pack(&[0u8; 32]))
-                    .deposit_block_timepoint(Pack::pack(&0))
+                    .deposit_finalized_timepoint(Pack::pack(&0))
                     .build();
                 let cell = build_rollup_locked_cell(
                     &rollup_type_script.hash(),
@@ -1183,7 +1183,7 @@ async fn test_check_reverted_cells_in_submit_block() {
             .map(|_| {
                 let args = CustodianLockArgs::new_builder()
                     .deposit_block_hash(Pack::pack(&[0u8; 32]))
-                    .deposit_block_timepoint(Pack::pack(&0))
+                    .deposit_finalized_timepoint(Pack::pack(&0))
                     .build();
                 build_rollup_locked_cell(
                     &rollup_type_script.hash(),
@@ -1478,7 +1478,7 @@ async fn test_withdrawal_cell_lock_args_with_owner_lock_in_submit_block() {
     let output_stake_cell = {
         let block_number = block_result.block.raw().number();
         let lock_args = StakeLockArgs::new_builder()
-            .stake_block_timepoint(block_number)
+            .stake_finalized_timepoint(block_number)
             .build();
         build_rollup_locked_cell(
             &rollup_type_script.hash(),
@@ -1519,7 +1519,7 @@ async fn test_withdrawal_cell_lock_args_with_owner_lock_in_submit_block() {
     // build withdrawal output
     let output_withdrawal_cell = {
         let lock_args = WithdrawalLockArgs::new_builder()
-            .withdrawal_block_timepoint(block_result.block.raw().number())
+            .withdrawal_finalized_timepoint(block_result.block.raw().number())
             .withdrawal_block_hash(Pack::pack(&block_result.block.raw().hash()))
             .account_script_hash(Pack::pack(&account_script.hash()))
             .owner_lock_hash(Pack::pack(&account_script.hash()))
diff --git a/crates/tests/src/script_tests/utils/context.rs b/crates/tests/src/script_tests/utils/context.rs
index 4fcf140d3..93f4d3e4b 100644
--- a/crates/tests/src/script_tests/utils/context.rs
+++ b/crates/tests/src/script_tests/utils/context.rs
@@ -7,11 +7,12 @@ use ckb_types::prelude::{Builder, Entity};
 use gw_common::{
     builtins::{CKB_SUDT_ACCOUNT_ID, RESERVED_ACCOUNT_ID},
     registry_address::RegistryAddress,
-    smt::SMT,
     state::State,
-    CKB_SUDT_SCRIPT_ARGS, H256,
+    CKB_SUDT_SCRIPT_ARGS,
 };
 use gw_generator::traits::StateExt;
+use gw_smt::smt::SMT;
+use gw_smt::smt::SMTH256;
 use gw_store::{
     smt::smt_store::SMTStateStore,
     snapshot::StoreSnapshot,
@@ -25,13 +26,14 @@ use gw_types::core::AllowedContractType;
 use gw_types::packed::AllowedTypeHash;
 use gw_types::{
     core::ScriptHashType,
+    h256::*,
     packed::{RollupConfig, Script},
     prelude::*,
 };
 use gw_utils::RollupContext;
 
 fn new_state(store: StoreSnapshot) -> MemStateDB {
-    let smt = SMT::new(H256::zero(), SMTStateStore::new(MemStore::new(store)));
+    let smt = SMT::new(SMTH256::zero(), SMTStateStore::new(MemStore::new(store)));
     let inner = MemStateTree::new(smt, 0);
     MemStateDB::new(inner)
 }
@@ -75,7 +77,7 @@ impl TestingContext {
     pub fn setup_with_config(rollup_config: RollupConfig) -> Self {
         let rollup_context = RollupContext {
             rollup_config: rollup_config.clone(),
-            rollup_script_hash: [42u8; 32].into(),
+            rollup_script_hash: [42u8; 32],
             ..Default::default()
         };
 
@@ -97,7 +99,7 @@ impl TestingContext {
 
         // setup CKB simple UDT contract
         let ckb_sudt_script =
-            gw_generator::sudt::build_l2_sudt_script(&rollup_context, &CKB_SUDT_SCRIPT_ARGS.into());
+            gw_generator::sudt::build_l2_sudt_script(&rollup_context, &CKB_SUDT_SCRIPT_ARGS);
         let ckb_sudt_id = state.create_account_from_script(ckb_sudt_script).unwrap();
         assert_eq!(
             ckb_sudt_id, CKB_SUDT_ACCOUNT_ID,
diff --git a/crates/tests/src/script_tests/withdrawal.rs b/crates/tests/src/script_tests/withdrawal.rs
index 15fc40ee1..a4773a87a 100644
--- a/crates/tests/src/script_tests/withdrawal.rs
+++ b/crates/tests/src/script_tests/withdrawal.rs
@@ -22,7 +22,7 @@ use gw_types::packed::{
     WithdrawalLockArgs, WitnessArgs,
 };
 use gw_types::prelude::{Pack, Unpack};
-use secp256k1::rand::rngs::OsRng;
+use secp256k1::rand::rngs::ThreadRng;
 use secp256k1::{Message, Secp256k1, SecretKey};
 
 pub use conversion::{ToCKBType, ToGWType};
@@ -39,12 +39,12 @@ fn test_unlock_withdrawal_via_finalize_by_input_owner_cell() {
     let rollup_type_hash = rollup_type_script.hash();
     let (mut verify_ctx, script_ctx) = build_verify_context();
 
-    let withdrawal_block_timepoint =
+    let withdrawal_finalized_timepoint =
         Timepoint::from_block_number(rand::random::<u32>() as u64 + 100);
     let (block_merkle_state, last_finalized_timepoint) =
         mock_global_state_timepoint_by_finalized_timepoint(
             &verify_ctx.rollup_config(),
-            &withdrawal_block_timepoint,
+            &withdrawal_finalized_timepoint,
         );
     let rollup_cell = {
         let global_state = GlobalState::new_builder()
@@ -68,12 +68,12 @@ fn test_unlock_withdrawal_via_finalize_by_input_owner_cell() {
 
     let (sk, pk) = {
         let secp = Secp256k1::new();
-        let mut rng = OsRng::new().unwrap();
+        let mut rng = ThreadRng::default();
         secp.generate_keypair(&mut rng)
     };
     let (err_sk, _err_pk) = {
         let secp = Secp256k1::new();
-        let mut rng = OsRng::new().unwrap();
+        let mut rng = ThreadRng::default();
         secp.generate_keypair(&mut rng)
     };
     let owner_lock = {
@@ -96,7 +96,7 @@ fn test_unlock_withdrawal_via_finalize_by_input_owner_cell() {
         let lock_args = WithdrawalLockArgs::new_builder()
             .account_script_hash(random_always_success_script().to_gw().hash().pack())
             .withdrawal_block_hash(random_always_success_script().to_gw().hash().pack())
-            .withdrawal_block_timepoint(withdrawal_block_timepoint.full_value().pack())
+            .withdrawal_finalized_timepoint(withdrawal_finalized_timepoint.full_value().pack())
             .owner_lock_hash(owner_lock.hash().pack())
             .build();
         let mut args = Vec::new();
@@ -187,12 +187,12 @@ fn test_unlock_withdrawal_via_finalize_by_switch_indexed_output_to_owner_lock()
     let rollup_type_hash = rollup_type_script.hash();
     let (mut verify_ctx, script_ctx) = build_verify_context();
 
-    let withdrawal_block_timepoint =
+    let withdrawal_finalized_timepoint =
         Timepoint::from_block_number(rand::random::<u32>() as u64 + 100);
     let (block_merkle_state, last_finalized_timepoint) =
         mock_global_state_timepoint_by_finalized_timepoint(
             &verify_ctx.rollup_config(),
-            &withdrawal_block_timepoint,
+            &withdrawal_finalized_timepoint,
         );
     let rollup_cell = {
         let global_state = GlobalState::new_builder()
@@ -219,7 +219,7 @@ fn test_unlock_withdrawal_via_finalize_by_switch_indexed_output_to_owner_lock()
         let lock_args = WithdrawalLockArgs::new_builder()
             .account_script_hash(random_always_success_script().to_gw().hash().pack())
             .withdrawal_block_hash(random_always_success_script().to_gw().hash().pack())
-            .withdrawal_block_timepoint(withdrawal_block_timepoint.full_value().pack())
+            .withdrawal_finalized_timepoint(withdrawal_finalized_timepoint.full_value().pack())
             .owner_lock_hash(owner_lock.hash().pack())
             .build();
 
@@ -365,12 +365,12 @@ fn test_unlock_withdrawal_via_finalize_fallback_to_input_owner_cell() {
     let rollup_type_hash = rollup_type_script.hash();
     let (mut verify_ctx, script_ctx) = build_verify_context();
 
-    let withdrawal_block_timepoint =
+    let withdrawal_finalized_timepoint =
         Timepoint::from_block_number(rand::random::<u32>() as u64 + 100);
     let (block_merkle_state, last_finalized_timepoint) =
         mock_global_state_timepoint_by_finalized_timepoint(
             &verify_ctx.rollup_config(),
-            &withdrawal_block_timepoint,
+            &withdrawal_finalized_timepoint,
         );
     let rollup_cell = {
         let global_state = GlobalState::new_builder()
@@ -394,7 +394,7 @@ fn test_unlock_withdrawal_via_finalize_fallback_to_input_owner_cell() {
 
     let (sk, pk) = {
         let secp = Secp256k1::new();
-        let mut rng = OsRng::new().unwrap();
+        let mut rng = ThreadRng::default();
         secp.generate_keypair(&mut rng)
     };
     let owner_lock = {
@@ -417,7 +417,7 @@ fn test_unlock_withdrawal_via_finalize_fallback_to_input_owner_cell() {
         let lock_args = WithdrawalLockArgs::new_builder()
             .account_script_hash(random_always_success_script().to_gw().hash().pack())
             .withdrawal_block_hash(random_always_success_script().to_gw().hash().pack())
-            .withdrawal_block_timepoint(withdrawal_block_timepoint.full_value().pack())
+            .withdrawal_finalized_timepoint(withdrawal_finalized_timepoint.full_value().pack())
             .owner_lock_hash(owner_lock.hash().pack())
             .build();
 
diff --git a/crates/tests/src/script_tests/withdrawal/finality.rs b/crates/tests/src/script_tests/withdrawal/finality.rs
index 2d99c905c..f64f89d88 100644
--- a/crates/tests/src/script_tests/withdrawal/finality.rs
+++ b/crates/tests/src/script_tests/withdrawal/finality.rs
@@ -1,19 +1,23 @@
 use crate::script_tests::programs::WITHDRAWAL_LOCK_PROGRAM;
 use crate::script_tests::utils::init_env_log;
-use crate::script_tests::utils::layer1::build_simple_tx_with_out_point;
 use crate::script_tests::utils::layer1::random_out_point;
+use crate::script_tests::utils::layer1::{
+    build_simple_tx_with_out_point_and_since, since_timestamp,
+};
 use crate::script_tests::utils::rollup::{random_always_success_script, CellContext};
 use crate::script_tests::utils::rollup_config::default_rollup_config;
 
+use crate::testing_tool::chain::DEFAULT_FINALITY_BLOCKS;
 use ckb_error::assert_error_eq;
 use ckb_script::ScriptError;
+use ckb_types::packed::Uint64;
 use ckb_types::prelude::{Builder, Entity};
 use gw_types::core::{ScriptHashType, Timepoint};
 use gw_types::packed::{
     BlockMerkleState, Byte32, CellDep, CellInput, CellOutput, GlobalState, OutPoint, Script,
     WithdrawalLockArgs,
 };
-use gw_types::prelude::{Pack, Unpack};
+use gw_types::prelude::Pack;
 use rand::random;
 
 use super::witness_unlock_withdrawal_via_finalize;
@@ -26,12 +30,14 @@ const NOT_FINALIZED_EXIT_CODE: i8 = 45;
 struct CaseParam {
     // test case id
     id: usize,
-    // GlobalState.block.count - 1 - rollup_config.finality_blocks
-    finalized_block_number: u64,
+    // tip block number
+    tip_block_number: u64,
     // GlobalState.last_finalized_timepoint
-    finalized_block_timestamp: u64,
-    // WithdrawalLockArgs.withdrawal_block_timepoint
-    withdrawal_block_timepoint: Timepoint,
+    global_state_last_finalized_timepoint: Timepoint,
+    // WithdrawalLockArgs.withdrawal_finalized_timepoint
+    withdrawal_finalized_timepoint: Timepoint,
+    // Input since
+    since: Uint64,
 
     // Even if the withdrawal cell is finalized, it needs one of the below condition matched:
     // - the same-index output with withdrawal cell has the same content
@@ -46,23 +52,20 @@ struct CaseParam {
 #[test]
 fn test_finality_of_withdrawal_lock() {
     init_env_log();
-    let finalized_block_number = random::<u32>() as u64 + 100;
-    let finalized_block_timestamp = random::<u32>() as u64 + 7 * 24 * 60 * 60 * 1000;
-    let finalized_timepoint_by_block_number = Timepoint::from_block_number(finalized_block_number);
-    let finalized_timepoint_by_block_timestamp =
-        Timepoint::from_timestamp(finalized_block_timestamp);
-    let unfinalized_timepoint_by_block_number =
-        Timepoint::from_block_number(finalized_block_number + 1);
-    let unfinalized_timepoint_by_block_timestamp =
-        Timepoint::from_timestamp(finalized_block_timestamp + 1);
+    let tip_block_number = random::<u32>() as u64 + 100;
+    let random_timestamp = random::<u32>() as u64 + 7 * 24 * 60 * 60 * 1000;
+    let global_state_last_finalized_timepoint = Timepoint::from_timestamp(random_timestamp);
 
     let cases = vec![
         CaseParam {
             // withdrawal_state_cell is finalized by block number
             id: 0,
-            finalized_block_number,
-            finalized_block_timestamp,
-            withdrawal_block_timepoint: finalized_timepoint_by_block_number.clone(),
+            tip_block_number,
+            global_state_last_finalized_timepoint: global_state_last_finalized_timepoint.clone(),
+            withdrawal_finalized_timepoint: Timepoint::from_block_number(
+                tip_block_number - DEFAULT_FINALITY_BLOCKS,
+            ),
+            since: Default::default(),
             unlock_path_include_one_owner_input: true,
             unlock_path_same_index_same_content_output: false,
             expected_result: Ok(()),
@@ -70,9 +73,12 @@ fn test_finality_of_withdrawal_lock() {
         CaseParam {
             // withdrawal_state_cell is not finalized by block number
             id: 1,
-            finalized_block_number,
-            finalized_block_timestamp,
-            withdrawal_block_timepoint: unfinalized_timepoint_by_block_number,
+            tip_block_number,
+            global_state_last_finalized_timepoint: global_state_last_finalized_timepoint.clone(),
+            withdrawal_finalized_timepoint: Timepoint::from_block_number(
+                tip_block_number + 1 - DEFAULT_FINALITY_BLOCKS,
+            ),
+            since: Default::default(),
             unlock_path_include_one_owner_input: true,
             unlock_path_same_index_same_content_output: false,
             expected_result: Err(NOT_FINALIZED_EXIT_CODE),
@@ -80,9 +86,10 @@ fn test_finality_of_withdrawal_lock() {
         CaseParam {
             // withdrawal_state_cell is finalized by block timestamp
             id: 2,
-            finalized_block_number,
-            finalized_block_timestamp,
-            withdrawal_block_timepoint: finalized_timepoint_by_block_timestamp,
+            tip_block_number,
+            global_state_last_finalized_timepoint: global_state_last_finalized_timepoint.clone(),
+            withdrawal_finalized_timepoint: global_state_last_finalized_timepoint.clone(),
+            since: since_timestamp(random_timestamp),
             unlock_path_include_one_owner_input: true,
             unlock_path_same_index_same_content_output: false,
             expected_result: Ok(()),
@@ -90,9 +97,10 @@ fn test_finality_of_withdrawal_lock() {
         CaseParam {
             // withdrawal_state_cell is not finalized by block timestamp
             id: 3,
-            finalized_block_number,
-            finalized_block_timestamp,
-            withdrawal_block_timepoint: unfinalized_timepoint_by_block_timestamp,
+            tip_block_number,
+            global_state_last_finalized_timepoint: global_state_last_finalized_timepoint.clone(),
+            withdrawal_finalized_timepoint: global_state_last_finalized_timepoint.clone(),
+            since: since_timestamp(random_timestamp - 1000),
             unlock_path_include_one_owner_input: true,
             unlock_path_same_index_same_content_output: false,
             expected_result: Err(NOT_FINALIZED_EXIT_CODE),
@@ -100,9 +108,12 @@ fn test_finality_of_withdrawal_lock() {
         CaseParam {
             // withdrawal_state_cell is finalized by block number, but we miss the owner input
             id: 4,
-            finalized_block_number,
-            finalized_block_timestamp,
-            withdrawal_block_timepoint: finalized_timepoint_by_block_number.clone(),
+            tip_block_number,
+            global_state_last_finalized_timepoint: global_state_last_finalized_timepoint.clone(),
+            withdrawal_finalized_timepoint: Timepoint::from_block_number(
+                tip_block_number - DEFAULT_FINALITY_BLOCKS,
+            ),
+            since: Default::default(),
             unlock_path_include_one_owner_input: false,
             unlock_path_same_index_same_content_output: false,
             expected_result: Err(OWNER_CELL_NOT_FOUND_EXIT_CODE),
@@ -110,9 +121,12 @@ fn test_finality_of_withdrawal_lock() {
         CaseParam {
             // withdrawal_state_cell is finalized by block number, unlock via check_output_cell_has_same_content
             id: 5,
-            finalized_block_number,
-            finalized_block_timestamp,
-            withdrawal_block_timepoint: finalized_timepoint_by_block_number,
+            tip_block_number,
+            global_state_last_finalized_timepoint,
+            withdrawal_finalized_timepoint: Timepoint::from_block_number(
+                tip_block_number - DEFAULT_FINALITY_BLOCKS,
+            ),
+            since: Default::default(),
             unlock_path_include_one_owner_input: false,
             unlock_path_same_index_same_content_output: true,
             expected_result: Ok(()),
@@ -125,20 +139,17 @@ fn run_case(case: CaseParam) {
     println!("{:?}", case);
     let CaseParam {
         id: _id,
-        finalized_block_number,
-        finalized_block_timestamp,
-        withdrawal_block_timepoint,
+        tip_block_number,
+        global_state_last_finalized_timepoint,
+        withdrawal_finalized_timepoint,
+        since,
         expected_result,
         unlock_path_same_index_same_content_output,
         unlock_path_include_one_owner_input,
     } = case;
     let rollup_config = default_rollup_config();
-
     let rollup_config_hash = rollup_config.hash();
-    let global_state_block_count =
-        1 + finalized_block_number + rollup_config.finality_blocks().unpack();
-    let global_state_last_finalized_timepoint =
-        Timepoint::from_timestamp(finalized_block_timestamp);
+    let global_state_block_count = 1 + tip_block_number;
 
     // Prepare context
     let prev_global_state = GlobalState::new_builder()
@@ -194,7 +205,9 @@ fn run_case(case: CaseParam) {
                         .owner_lock_hash(Byte32::new_unchecked(
                             withdrawal_owner_lock_hash.as_bytes(),
                         ))
-                        .withdrawal_block_timepoint(withdrawal_block_timepoint.full_value().pack())
+                        .withdrawal_finalized_timepoint(
+                            withdrawal_finalized_timepoint.full_value().pack(),
+                        )
                         .build();
                     let mut args = Vec::new();
                     args.extend_from_slice(rollup_state_type_hash.as_slice());
@@ -213,10 +226,10 @@ fn run_case(case: CaseParam) {
     let witness_args = witness_unlock_withdrawal_via_finalize();
 
     // Build transaction
-    let mut tx = build_simple_tx_with_out_point(
+    let mut tx = build_simple_tx_with_out_point_and_since(
         &mut ctx.inner,
         (withdrawal_state_cell.to_ckb(), Default::default()),
-        withdrawal_state_out_point,
+        (withdrawal_state_out_point, since),
         (
             CellOutput::new_builder().build().to_ckb(),
             Default::default(),
@@ -292,7 +305,7 @@ fn run_case(case: CaseParam) {
 // Build common-used cells for testing stake-lock:
 //   - rollup_config_cell, finality_blocks = ROLLUP_CONFIG_FINALITY_BLOCKS
 //   - rollup_code_cell, is ALWAYS_SUCCESS_PROGRAM
-//   - rollup_state_cell, last_finalized_block_number = ROLLUP_STATE_LAST_FINALIZED_BLOCK_NUMBER
+//   - rollup_state_cell, last_finalized_timepoint = ROLLUP_STATE_LAST_FINALIZED_BLOCK_NUMBER
 //   - withdrawal_code_cell, is withdrawal_LOCK_PROGRAM
 //   - withdrawal_owner_cell, is ALWAYS_SUCCESS_PROGRAM
 //
diff --git a/crates/tests/src/testing_tool/bad_block.rs b/crates/tests/src/testing_tool/bad_block.rs
index 7cb1fefe4..6c9bdf0a5 100644
--- a/crates/tests/src/testing_tool/bad_block.rs
+++ b/crates/tests/src/testing_tool/bad_block.rs
@@ -1,9 +1,8 @@
 use gw_chain::chain::Chain;
-use gw_common::{
-    h256_ext::H256Ext,
-    merkle_utils::{calculate_ckb_merkle_root, ckb_merkle_leaf_hash},
-    smt::Blake2bHasher,
-    H256,
+use gw_common::merkle_utils::{calculate_ckb_merkle_root, ckb_merkle_leaf_hash};
+use gw_smt::{
+    smt::{Blake2bHasher, SMTH256},
+    smt_h256_ext::SMTH256Ext,
 };
 use gw_types::{
     packed::{BlockMerkleState, GlobalState, L2Block, SubmitWithdrawals, WithdrawalRequest},
@@ -31,8 +30,8 @@ pub fn generate_bad_block_using_first_withdrawal(
             let witnesses = withdrawals
                 .iter()
                 .enumerate()
-                .map(|(idx, t)| ckb_merkle_leaf_hash(idx as u32, &t.witness_hash().into()));
-            calculate_ckb_merkle_root(witnesses.collect()).unwrap()
+                .map(|(idx, t)| ckb_merkle_leaf_hash(idx as u32, &t.witness_hash()));
+            calculate_ckb_merkle_root(witnesses.collect())
         };
 
         let submit_withdrawals = SubmitWithdrawals::new_builder()
@@ -60,9 +59,9 @@ pub fn generate_bad_block_using_first_withdrawal(
         let bad_block_proof = db
             .block_smt()
             .unwrap()
-            .merkle_proof(vec![H256::from_u64(block_number)])
+            .merkle_proof(vec![SMTH256::from_u64(block_number)])
             .unwrap()
-            .compile(vec![H256::from_u64(block_number)])
+            .compile(vec![SMTH256::from_u64(block_number)])
             .unwrap();
 
         // Generate new block smt for global state
diff --git a/crates/tests/src/testing_tool/chain.rs b/crates/tests/src/testing_tool/chain.rs
index 836a3d8b4..aa7073254 100644
--- a/crates/tests/src/testing_tool/chain.rs
+++ b/crates/tests/src/testing_tool/chain.rs
@@ -4,7 +4,7 @@ use gw_block_producer::produce_block::{
     generate_produce_block_param, produce_block, ProduceBlockParam, ProduceBlockResult,
 };
 use gw_chain::chain::{Chain, L1Action, L1ActionContext, SyncParam};
-use gw_common::{blake2b::new_blake2b, H256};
+use gw_common::blake2b::new_blake2b;
 use gw_config::{BackendConfig, BackendForkConfig, ChainConfig, GenesisConfig, MemPoolConfig};
 use gw_generator::{
     account_lock_manage::{
@@ -19,6 +19,7 @@ use gw_store::{mem_pool_state::MemPoolState, traits::chain_store::ChainStore, St
 use gw_types::{
     bytes::Bytes,
     core::{AllowedContractType, AllowedEoaType, ScriptHashType},
+    h256::*,
     offchain::{CellInfo, DepositInfo},
     packed::{
         AllowedTypeHash, CellOutput, DepositInfoVec, DepositLockArgs, DepositRequest, L2Block,
@@ -216,9 +217,9 @@ impl TestChain {
         let rollup_config = chain.generator().rollup_context().rollup_config.to_owned();
         let mut account_lock_manage = AccountLockManage::default();
         account_lock_manage
-            .register_lock_algorithm((*ALWAYS_SUCCESS_CODE_HASH).into(), Arc::new(AlwaysSuccess));
+            .register_lock_algorithm(*ALWAYS_SUCCESS_CODE_HASH, Arc::new(AlwaysSuccess));
         account_lock_manage.register_lock_algorithm(
-            (*ETH_ACCOUNT_LOCK_CODE_HASH).into(),
+            *ETH_ACCOUNT_LOCK_CODE_HASH,
             Arc::new(Secp256k1Eth::default()),
         );
 
@@ -378,10 +379,9 @@ pub async fn setup_chain(rollup_type_script: Script) -> Chain {
         .finality_blocks(DEFAULT_FINALITY_BLOCKS.pack())
         .chain_id(TEST_CHAIN_ID.pack())
         .build();
-    account_lock_manage
-        .register_lock_algorithm((*ALWAYS_SUCCESS_CODE_HASH).into(), Arc::new(AlwaysSuccess));
+    account_lock_manage.register_lock_algorithm(*ALWAYS_SUCCESS_CODE_HASH, Arc::new(AlwaysSuccess));
     account_lock_manage.register_lock_algorithm(
-        (*ETH_ACCOUNT_LOCK_CODE_HASH).into(),
+        *ETH_ACCOUNT_LOCK_CODE_HASH,
         Arc::new(Secp256k1Eth::default()),
     );
     let chain = setup_chain_with_account_lock_manage(
@@ -402,10 +402,9 @@ pub async fn setup_chain_with_config(
     rollup_config: RollupConfig,
 ) -> Chain {
     let mut account_lock_manage = AccountLockManage::default();
-    account_lock_manage
-        .register_lock_algorithm((*ALWAYS_SUCCESS_CODE_HASH).into(), Arc::new(AlwaysSuccess));
+    account_lock_manage.register_lock_algorithm(*ALWAYS_SUCCESS_CODE_HASH, Arc::new(AlwaysSuccess));
     account_lock_manage.register_lock_algorithm(
-        (*ETH_ACCOUNT_LOCK_CODE_HASH).into(),
+        *ETH_ACCOUNT_LOCK_CODE_HASH,
         Arc::new(Secp256k1Eth::default()),
     );
     setup_chain_with_account_lock_manage(
@@ -427,10 +426,9 @@ pub async fn restart_chain(
 ) -> Chain {
     let mut account_lock_manage = AccountLockManage::default();
     let rollup_config = chain.generator().rollup_context().rollup_config.to_owned();
-    account_lock_manage
-        .register_lock_algorithm((*ALWAYS_SUCCESS_CODE_HASH).into(), Arc::new(AlwaysSuccess));
+    account_lock_manage.register_lock_algorithm(*ALWAYS_SUCCESS_CODE_HASH, Arc::new(AlwaysSuccess));
     account_lock_manage.register_lock_algorithm(
-        (*ETH_ACCOUNT_LOCK_CODE_HASH).into(),
+        *ETH_ACCOUNT_LOCK_CODE_HASH,
         Arc::new(Secp256k1Eth::default()),
     );
     let restore_path = {
@@ -456,15 +454,14 @@ pub async fn restart_chain(
 pub fn chain_generator(chain: &Chain, rollup_type_script: Script) -> Arc<Generator> {
     let rollup_config = chain.generator().rollup_context().rollup_config.to_owned();
     let mut account_lock_manage = AccountLockManage::default();
-    account_lock_manage
-        .register_lock_algorithm((*ALWAYS_SUCCESS_CODE_HASH).into(), Arc::new(AlwaysSuccess));
+    account_lock_manage.register_lock_algorithm(*ALWAYS_SUCCESS_CODE_HASH, Arc::new(AlwaysSuccess));
     account_lock_manage.register_lock_algorithm(
-        (*ETH_ACCOUNT_LOCK_CODE_HASH).into(),
+        *ETH_ACCOUNT_LOCK_CODE_HASH,
         Arc::new(Secp256k1Eth::default()),
     );
     let backend_manage = build_backend_manage(&rollup_config);
     let rollup_context = RollupContext {
-        rollup_script_hash: rollup_type_script.hash().into(),
+        rollup_script_hash: rollup_type_script.hash(),
         rollup_config,
         ..Default::default()
     };
@@ -501,7 +498,7 @@ pub async fn setup_chain_with_account_lock_manage(
     init_genesis(&store, &genesis_config, &[0u8; 32], Bytes::default()).unwrap();
     let backend_manage = build_backend_manage(&rollup_config);
     let rollup_context = RollupContext {
-        rollup_script_hash: rollup_script_hash.into(),
+        rollup_script_hash,
         rollup_config: rollup_config.clone(),
         ..Default::default()
     };
@@ -592,7 +589,7 @@ pub async fn apply_block_result(
     let mem_pool = chain.mem_pool();
     let mut mem_pool = mem_pool.as_deref().unwrap().lock().await;
     mem_pool
-        .notify_new_tip(hash.into(), &Default::default())
+        .notify_new_tip(hash, &Default::default())
         .await
         .unwrap();
     Ok(())
@@ -622,7 +619,7 @@ pub async fn construct_block_with_timestamp(
     let stake_cell_owner_lock_hash = H256::zero();
     let db = &chain.store().begin_transaction();
     let generator = chain.generator();
-    let rollup_config_hash = chain.rollup_config_hash().into();
+    let rollup_config_hash = chain.rollup_config_hash();
 
     let provider = DummyMemPoolProvider {
         deposit_cells: deposit_info_vec.unpack(),
diff --git a/crates/tests/src/testing_tool/common.rs b/crates/tests/src/testing_tool/common.rs
index c858f5a2e..462f6ab02 100644
--- a/crates/tests/src/testing_tool/common.rs
+++ b/crates/tests/src/testing_tool/common.rs
@@ -1,6 +1,6 @@
 use ckb_types::prelude::{Builder, Entity};
-use gw_common::H256;
 use gw_types::core::ScriptHashType;
+use gw_types::h256::*;
 use gw_types::packed::Script;
 use gw_types::prelude::Pack;
 
diff --git a/crates/tests/src/testing_tool/eth_wallet.rs b/crates/tests/src/testing_tool/eth_wallet.rs
index 92095ba54..755f61596 100644
--- a/crates/tests/src/testing_tool/eth_wallet.rs
+++ b/crates/tests/src/testing_tool/eth_wallet.rs
@@ -6,12 +6,12 @@ use gw_common::{
     registry::eth_registry::extract_eth_address_from_eoa,
     registry_address::RegistryAddress,
     state::State,
-    H256,
 };
 use gw_generator::{account_lock_manage::secp256k1::Secp256k1Eth, traits::StateExt};
 use gw_traits::CodeStore;
 use gw_types::{
     bytes::Bytes,
+    h256::*,
     packed::{L2Transaction, RawL2Transaction, Script},
     prelude::{Pack, Unpack},
     U256,
@@ -31,13 +31,13 @@ impl EthWallet {
     pub fn random(rollup_script_hash: H256) -> Self {
         let privkey = {
             let sk = SecretKey::from_slice(&OsRng.gen::<[u8; 32]>()).expect("generating SecretKey");
-            Privkey::from_slice(&sk.serialize_secret())
+            Privkey::from_slice(&sk.secret_bytes())
         };
 
         let account_script = privkey_to_eth_account_script(
             &privkey,
             &rollup_script_hash,
-            &(*ETH_ACCOUNT_LOCK_CODE_HASH).into(),
+            &(*ETH_ACCOUNT_LOCK_CODE_HASH),
         )
         .expect("random wallet");
 
@@ -64,7 +64,7 @@ impl EthWallet {
     }
 
     pub fn account_script_hash(&self) -> H256 {
-        self.inner.lock_script().hash().into()
+        self.inner.lock_script().hash()
     }
 
     pub fn sign_polyjuice_tx(
@@ -85,7 +85,7 @@ impl EthWallet {
         let chain_id = raw_tx.chain_id().unpack();
         let signing_message =
             Secp256k1Eth::polyjuice_tx_signing_message(chain_id, &raw_tx, &to_script)?;
-        let sig = self.sign_message(signing_message.into())?;
+        let sig = self.sign_message(signing_message)?;
 
         let tx = L2Transaction::new_builder()
             .raw(raw_tx)
@@ -108,7 +108,7 @@ impl EthWallet {
 
         state.mapping_registry_address_to_script_hash(
             self.registry_address.to_owned(),
-            self.account_script().hash().into(),
+            self.account_script().hash(),
         )?;
         state.mint_sudt(CKB_SUDT_ACCOUNT_ID, &self.registry_address, ckb_balance)?;
 
diff --git a/crates/tests/src/testing_tool/polyjuice.rs b/crates/tests/src/testing_tool/polyjuice.rs
index f5c93daea..8bd65c8ea 100644
--- a/crates/tests/src/testing_tool/polyjuice.rs
+++ b/crates/tests/src/testing_tool/polyjuice.rs
@@ -5,12 +5,12 @@ use gw_common::{
     builtins::{CKB_SUDT_ACCOUNT_ID, ETH_REGISTRY_ACCOUNT_ID},
     registry_address::RegistryAddress,
     state::State,
-    H256,
 };
 use gw_generator::traits::StateExt;
 use gw_store::traits::chain_store::ChainStore;
 use gw_types::{
     core::ScriptHashType,
+    h256::*,
     packed::{LogItem, Script},
     prelude::{Builder, Entity, Pack},
 };
diff --git a/crates/tests/src/testing_tool/rpc_server.rs b/crates/tests/src/testing_tool/rpc_server.rs
index 8a51c1f99..4bb917610 100644
--- a/crates/tests/src/testing_tool/rpc_server.rs
+++ b/crates/tests/src/testing_tool/rpc_server.rs
@@ -4,8 +4,8 @@ use anyhow::{bail, Result};
 use ckb_types::prelude::Entity;
 use gw_block_producer::test_mode_control::TestModeControl;
 use gw_chain::chain::Chain;
-use gw_common::H256;
 use gw_config::{NodeMode::FullNode, RPCClientConfig, RPCMethods};
+use gw_types::h256::*;
 
 use gw_jsonrpc_types::{
     ckb_jsonrpc_types::{Byte32, JsonBytes, Uint64},
@@ -48,9 +48,8 @@ impl RPCServer {
         let rollup_config = generator.rollup_context().rollup_config.to_owned();
         let rollup_context = generator.rollup_context().to_owned();
         let rpc_client = {
-            let indexer_client =
-                CKBIndexerClient::with_url(&RPCClientConfig::default().indexer_url).unwrap();
             let ckb_client = CKBClient::with_url(&RPCClientConfig::default().ckb_url).unwrap();
+            let indexer_client = CKBIndexerClient::new(ckb_client.client().clone(), false);
             let rollup_type_script =
                 ckb_types::packed::Script::new_unchecked(rollup_type_script.as_bytes());
             RPCClient::new(
@@ -117,7 +116,7 @@ impl RPCServer {
             .finish();
 
         let tx_hash: Option<Byte32> = self.handle_single_request(req).await?;
-        Ok(tx_hash.map(|h| h.0.into()))
+        Ok(tx_hash.map(|h| h.0))
     }
 
     pub async fn execute_l2transaction(&self, tx: &L2Transaction) -> Result<RunResult> {
@@ -171,7 +170,7 @@ impl RPCServer {
     }
 
     pub async fn is_request_in_queue(&self, hash: H256) -> Result<bool> {
-        let fixed_hash = ckb_fixed_hash::H256(hash.into());
+        let fixed_hash = ckb_fixed_hash::H256(hash);
         let params = serde_json::to_value(&(fixed_hash,))?;
 
         let req = RequestBuilder::default()
@@ -197,7 +196,7 @@ impl RPCServer {
             .finish();
 
         let hash: Byte32 = self.handle_single_request(req).await?;
-        Ok(hash.0.into())
+        Ok(hash.0)
     }
 
     async fn handle_single_request<R: DeserializeOwned>(&self, req: RequestObject) -> Result<R> {
diff --git a/crates/tests/src/tests/calc_finalizing_range.rs b/crates/tests/src/tests/calc_finalizing_range.rs
index e36e90aa7..0ebb480f1 100644
--- a/crates/tests/src/tests/calc_finalizing_range.rs
+++ b/crates/tests/src/tests/calc_finalizing_range.rs
@@ -23,7 +23,7 @@ async fn test_calc_finalizing_range() {
     //
     // block[0].ts = 0
     // block[i].ts = block[i-1].ts + random(1, rollup_config.finality_time_in_ms())
-    // global_state[i].last_finalized_timepoint = block[i].ts - rollup_config.finality_time_in_ms()
+    // global_state[i].last_finalized_timepoint = block[i].ts
     //
     // Assertions:
     // - No overlapped finalizing ranges
@@ -73,8 +73,7 @@ async fn test_calc_finalizing_range() {
                 let finality_as_blocks = rollup_config.finality_blocks().unpack();
                 Timepoint::from_block_number(number.saturating_sub(finality_as_blocks))
             } else {
-                let finality_time_in_mss = rollup_config.finality_time_in_ms();
-                Timepoint::from_timestamp(timestamp.saturating_sub(finality_time_in_mss))
+                Timepoint::from_timestamp(timestamp)
             };
             GlobalState::new_builder()
                 .version(version.into())
diff --git a/crates/tests/src/tests/chain.rs b/crates/tests/src/tests/chain.rs
index 5e54c9900..0596c3b9b 100644
--- a/crates/tests/src/tests/chain.rs
+++ b/crates/tests/src/tests/chain.rs
@@ -11,7 +11,7 @@ use gw_chain::chain::{
     Chain, ChallengeCell, L1Action, L1ActionContext, RevertL1ActionContext, RevertedL1Action,
     SyncEvent, SyncParam,
 };
-use gw_common::{builtins::CKB_SUDT_ACCOUNT_ID, ckb_decimal::CKBCapacity, state::State, H256};
+use gw_common::{builtins::CKB_SUDT_ACCOUNT_ID, ckb_decimal::CKBCapacity, state::State};
 use gw_store::{
     state::{history::history_state::RWConfig, BlockStateDB},
     traits::chain_store::ChainStore,
@@ -19,6 +19,7 @@ use gw_store::{
 use gw_types::{
     bytes::Bytes,
     core::{ScriptHashType, Status},
+    h256::*,
     packed::{
         CellInput, CellOutput, DepositInfoVec, DepositRequest, GlobalState, RawWithdrawalRequest,
         Script, WithdrawalRequest, WithdrawalRequestExtra,
@@ -136,8 +137,8 @@ async fn test_produce_blocks() {
     {
         let db = chain.store().begin_transaction();
         let tree = BlockStateDB::from_store(&db, RWConfig::readonly()).unwrap();
-        let script_hash_a: H256 = user_script_a.hash().into();
-        let script_hash_b: H256 = user_script_b.hash().into();
+        let script_hash_a: H256 = user_script_a.hash();
+        let script_hash_b: H256 = user_script_b.hash();
         let id_a = tree
             .get_account_id_by_script_hash(&script_hash_a)
             .unwrap()
@@ -510,7 +511,7 @@ async fn test_layer1_revert() {
         );
 
         assert_eq!(tree.get_account_count().unwrap(), 4);
-        let alice_script_hash: H256 = alice_script.hash().into();
+        let alice_script_hash: H256 = alice_script.hash();
         let alice_id = tree
             .get_account_id_by_script_hash(&alice_script_hash)
             .unwrap()
@@ -532,7 +533,7 @@ async fn test_layer1_revert() {
         );
 
         let bob_id_opt = tree
-            .get_account_id_by_script_hash(&bob_script.hash().into())
+            .get_account_id_by_script_hash(&bob_script.hash())
             .unwrap();
         assert!(bob_id_opt.is_none());
     }
@@ -564,7 +565,7 @@ async fn test_layer1_revert() {
         );
 
         assert_eq!(tree.get_account_count().unwrap(), 5);
-        let alice_script_hash: H256 = alice_script.hash().into();
+        let alice_script_hash: H256 = alice_script.hash();
         let alice_id = tree
             .get_account_id_by_script_hash(&alice_script_hash)
             .unwrap()
@@ -585,7 +586,7 @@ async fn test_layer1_revert() {
             CKBCapacity::from_layer1(400 * CKB).to_layer2()
         );
 
-        let bob_script_hash: H256 = bob_script.hash().into();
+        let bob_script_hash: H256 = bob_script.hash();
         let bob_id = tree
             .get_account_id_by_script_hash(&bob_script_hash)
             .unwrap()
@@ -627,7 +628,7 @@ async fn test_sync_blocks() {
             args.pack()
         })
         .build();
-    let sudt_script_hash: H256 = [42u8; 32].into();
+    let sudt_script_hash: H256 = [42u8; 32];
     let deposit = DepositRequest::new_builder()
         .capacity((400u64 * CKB).pack())
         .script(user_script_a.clone())
@@ -679,16 +680,16 @@ async fn test_sync_blocks() {
         let tip_block = db.get_tip_block().unwrap();
         let tip_block_number: u64 = tip_block.raw().number().unpack();
         let tip_block_hash = db.get_tip_block_hash().unwrap();
-        assert_eq!(tip_block_hash, tip_block.hash().into());
+        assert_eq!(tip_block_hash, tip_block.hash());
         assert_eq!(tip_block_number, 3);
 
         let tree = BlockStateDB::from_store(db, RWConfig::readonly()).unwrap();
-        let script_hash_a: H256 = user_script_a.hash().into();
+        let script_hash_a: H256 = user_script_a.hash();
         let id_a = tree
             .get_account_id_by_script_hash(&script_hash_a)
             .unwrap()
             .unwrap();
-        let script_hash_b: H256 = user_script_b.hash().into();
+        let script_hash_b: H256 = user_script_b.hash();
         let id_b = tree
             .get_account_id_by_script_hash(&script_hash_b)
             .unwrap()
diff --git a/crates/tests/src/tests/deposit_withdrawal.rs b/crates/tests/src/tests/deposit_withdrawal.rs
index f9f47e1f4..f9199f00b 100644
--- a/crates/tests/src/tests/deposit_withdrawal.rs
+++ b/crates/tests/src/tests/deposit_withdrawal.rs
@@ -11,7 +11,6 @@ use gw_common::{
     builtins::{CKB_SUDT_ACCOUNT_ID, ETH_REGISTRY_ACCOUNT_ID},
     ckb_decimal::CKBCapacity,
     state::State,
-    H256,
 };
 use gw_generator::{
     error::{DepositError, WithdrawalError},
@@ -22,6 +21,7 @@ use gw_store::{
     state::{history::history_state::RWConfig, BlockStateDB},
     traits::chain_store::ChainStore,
 };
+use gw_types::h256::*;
 use gw_types::{
     core::ScriptHashType,
     packed::{
@@ -149,7 +149,7 @@ async fn test_deposit_and_withdrawal() {
             "3 builtin accounts plus 1 deposit"
         );
         let user_id = tree
-            .get_account_id_by_script_hash(&user_script_hash.into())
+            .get_account_id_by_script_hash(&user_script_hash)
             .unwrap()
             .expect("account exists");
         assert_ne!(user_id, 0);
@@ -293,7 +293,7 @@ async fn test_deposit_u128_overflow() {
             args.pack()
         })
         .build();
-    let sudt_script_hash: H256 = sudt_script.hash().into();
+    let sudt_script_hash: H256 = sudt_script.hash();
 
     let capacity = 600_00000000;
     let alice_script = Script::new_builder()
@@ -305,7 +305,7 @@ async fn test_deposit_u128_overflow() {
             args.pack()
         })
         .build();
-    let alice_script_hash: H256 = alice_script.hash().into();
+    let alice_script_hash: H256 = alice_script.hash();
 
     deposite_to_chain(
         &mut chain,
@@ -327,7 +327,7 @@ async fn test_deposit_u128_overflow() {
             args.pack()
         })
         .build();
-    let bob_script_hash: H256 = bob_script.hash().into();
+    let bob_script_hash: H256 = bob_script.hash();
 
     deposite_to_chain(
         &mut chain,
@@ -390,7 +390,7 @@ async fn test_deposit_u128_overflow() {
     let l2_sudt_script_hash =
         build_l2_sudt_script(chain.generator().rollup_context(), &sudt_script_hash).hash();
     let sudt_id = tree
-        .get_account_id_by_script_hash(&l2_sudt_script_hash.into())
+        .get_account_id_by_script_hash(&l2_sudt_script_hash)
         .unwrap()
         .expect("sudt exists");
 
@@ -464,7 +464,7 @@ async fn test_overdraft() {
     let withdraw_capacity = 600_00000000u64;
     let err = withdrawal_from_chain(
         &mut chain,
-        user_script_hash.into(),
+        user_script_hash,
         withdraw_capacity,
         H256::zero(),
         0,
@@ -482,7 +482,7 @@ async fn test_overdraft() {
         let state = mem_pool.mem_pool_state().load_state_db();
 
         let user_addr = state
-            .get_registry_address_by_script_hash(ETH_REGISTRY_ACCOUNT_ID, &user_script_hash.into())
+            .get_registry_address_by_script_hash(ETH_REGISTRY_ACCOUNT_ID, &user_script_hash)
             .unwrap()
             .unwrap();
 
@@ -562,7 +562,7 @@ async fn test_produce_block_after_re_inject_withdrawal() {
             "3 builtin accounts plus 1 deposit"
         );
         let user_id = tree
-            .get_account_id_by_script_hash(&user_script_hash.into())
+            .get_account_id_by_script_hash(&user_script_hash)
             .unwrap()
             .expect("account exists");
         assert_ne!(user_id, 0);
diff --git a/crates/tests/src/tests/export_import_block.rs b/crates/tests/src/tests/export_import_block.rs
index 5ab38654b..716c436ad 100644
--- a/crates/tests/src/tests/export_import_block.rs
+++ b/crates/tests/src/tests/export_import_block.rs
@@ -16,7 +16,6 @@ use ckb_types::prelude::{Builder, Entity};
 use godwoken_bin::subcommand::{export_block::ExportBlock, import_block::ImportBlock};
 use gw_block_producer::produce_block::ProduceBlockResult;
 use gw_chain::chain::{Chain, ChallengeCell, L1Action, L1ActionContext, SyncEvent, SyncParam};
-use gw_common::H256;
 use gw_config::StoreConfig;
 use gw_db::{read_only_db::ReadOnlyDB, schema::COLUMNS, RocksDB};
 use gw_generator::account_lock_manage::always_success::AlwaysSuccess;
@@ -24,6 +23,7 @@ use gw_generator::account_lock_manage::secp256k1::Secp256k1Eth;
 use gw_generator::account_lock_manage::AccountLockManage;
 use gw_store::{readonly::StoreReadonly, traits::chain_store::ChainStore, Store};
 use gw_types::core::{Status, Timepoint};
+use gw_types::h256::*;
 use gw_types::packed::DepositInfoVec;
 use gw_types::{
     bytes::Bytes,
@@ -81,7 +81,7 @@ async fn test_export_import_block() {
         .args(vec![1u8; 32].pack())
         .build();
 
-    let rollup_script_hash: H256 = rollup_type_script.hash().into();
+    let rollup_script_hash: H256 = rollup_type_script.hash();
     let rollup_cell = CellInfo {
         data: global_state.as_bytes(),
         out_point: OutPoint::new_builder()
@@ -104,9 +104,9 @@ async fn test_export_import_block() {
     let mut chain = {
         let mut account_lock_manage = AccountLockManage::default();
         account_lock_manage
-            .register_lock_algorithm((*ALWAYS_SUCCESS_CODE_HASH).into(), Arc::new(AlwaysSuccess));
+            .register_lock_algorithm(*ALWAYS_SUCCESS_CODE_HASH, Arc::new(AlwaysSuccess));
         account_lock_manage.register_lock_algorithm(
-            (*ETH_ACCOUNT_LOCK_CODE_HASH).into(),
+            *ETH_ACCOUNT_LOCK_CODE_HASH,
             Arc::new(Secp256k1Eth::default()),
         );
         setup_chain_with_account_lock_manage(
@@ -209,9 +209,9 @@ async fn test_export_import_block() {
     let import_chain = {
         let mut account_lock_manage = AccountLockManage::default();
         account_lock_manage
-            .register_lock_algorithm((*ALWAYS_SUCCESS_CODE_HASH).into(), Arc::new(AlwaysSuccess));
+            .register_lock_algorithm(*ALWAYS_SUCCESS_CODE_HASH, Arc::new(AlwaysSuccess));
         account_lock_manage.register_lock_algorithm(
-            (*ETH_ACCOUNT_LOCK_CODE_HASH).into(),
+            *ETH_ACCOUNT_LOCK_CODE_HASH,
             Arc::new(Secp256k1Eth::default()),
         );
         setup_chain_with_account_lock_manage(
@@ -294,9 +294,9 @@ async fn test_export_import_block() {
     let import_chain = {
         let mut account_lock_manage = AccountLockManage::default();
         account_lock_manage
-            .register_lock_algorithm((*ALWAYS_SUCCESS_CODE_HASH).into(), Arc::new(AlwaysSuccess));
+            .register_lock_algorithm(*ALWAYS_SUCCESS_CODE_HASH, Arc::new(AlwaysSuccess));
         account_lock_manage.register_lock_algorithm(
-            (*ETH_ACCOUNT_LOCK_CODE_HASH).into(),
+            *ETH_ACCOUNT_LOCK_CODE_HASH,
             Arc::new(Secp256k1Eth::default()),
         );
         setup_chain_with_account_lock_manage(
diff --git a/crates/tests/src/tests/mem_block_repackage.rs b/crates/tests/src/tests/mem_block_repackage.rs
index ceb1b461b..9aa355da4 100644
--- a/crates/tests/src/tests/mem_block_repackage.rs
+++ b/crates/tests/src/tests/mem_block_repackage.rs
@@ -9,10 +9,10 @@ use gw_block_producer::{
     produce_block::{generate_produce_block_param, produce_block, ProduceBlockParam},
     replay_block::ReplayBlock,
 };
-use gw_common::H256;
 use gw_generator::traits::StateExt;
 use gw_mem_pool::pool::OutputParam;
 use gw_store::{state::MemStateDB, traits::chain_store::ChainStore};
+use gw_types::h256::*;
 use gw_types::{
     core::ScriptHashType,
     offchain::{CellInfo, DepositInfo},
@@ -20,7 +20,6 @@ use gw_types::{
     prelude::*,
 };
 use gw_utils::RollupContext;
-
 use std::time::Duration;
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
@@ -29,7 +28,7 @@ async fn test_repackage_mem_block() {
     const DEPOSIT_AMOUNT: u128 = 0;
 
     let rollup_type_script = Script::default();
-    let rollup_script_hash = rollup_type_script.hash().into();
+    let rollup_script_hash = rollup_type_script.hash();
     let chain = setup_chain(rollup_type_script).await;
 
     let users = (0..10).map(|_| random_always_success_script(&rollup_script_hash));
@@ -77,14 +76,12 @@ async fn test_repackage_mem_block() {
     let reverted_block_root: H256 = {
         let db = chain.store().begin_transaction();
         let smt = db.reverted_block_smt().unwrap();
-        smt.root().to_owned()
+        (*smt.root()).into()
     };
     let param = ProduceBlockParam {
-        stake_cell_owner_lock_hash: random_always_success_script(&rollup_script_hash)
-            .hash()
-            .into(),
+        stake_cell_owner_lock_hash: random_always_success_script(&rollup_script_hash).hash(),
         reverted_block_root,
-        rollup_config_hash: rollup_context.rollup_config.hash().into(),
+        rollup_config_hash: rollup_context.rollup_config.hash(),
         block_param,
     };
     let store = chain.store();
diff --git a/crates/tests/src/tests/mem_pool_ckb_transfer_create_new_recipient_account.rs b/crates/tests/src/tests/mem_pool_ckb_transfer_create_new_recipient_account.rs
index 0d6236737..8c8433ba7 100644
--- a/crates/tests/src/tests/mem_pool_ckb_transfer_create_new_recipient_account.rs
+++ b/crates/tests/src/tests/mem_pool_ckb_transfer_create_new_recipient_account.rs
@@ -4,12 +4,12 @@ use gw_common::{
     ckb_decimal::CKBCapacity,
     registry_address::RegistryAddress,
     state::State,
-    H256,
 };
 use gw_generator::account_lock_manage::secp256k1::Secp256k1Eth;
 use gw_mem_pool::account_creator::{AccountCreator, MIN_BALANCE};
 use gw_types::{
     bytes::Bytes,
+    h256::*,
     packed::{
         CreateAccount, DepositInfoVec, DepositRequest, Fee, L2Transaction, MetaContractArgs,
         RawL2Transaction, Script,
@@ -88,7 +88,7 @@ async fn test_create_account_for_ckb_transfer_new_address_recipient() {
         meta_contract_script_hash,
     )
     .unwrap();
-    let sign = test_wallet.sign_message(signing_message.into()).unwrap();
+    let sign = test_wallet.sign_message(signing_message).unwrap();
 
     let deploy_tx = L2Transaction::new_builder()
         .raw(raw_l2tx)
@@ -103,7 +103,7 @@ async fn test_create_account_for_ckb_transfer_new_address_recipient() {
 
     // Depoly erc20 contract
     let polyjuice_account_id = state
-        .get_account_id_by_script_hash(&polyjuice_account.hash().into())
+        .get_account_id_by_script_hash(&polyjuice_account.hash())
         .unwrap()
         .unwrap();
     let deploy_args = SudtErc20ArgsBuilder::deploy(CKB_SUDT_ACCOUNT_ID, 18).finish();
@@ -116,7 +116,7 @@ async fn test_create_account_for_ckb_transfer_new_address_recipient() {
         .build();
 
     let deploy_tx = test_wallet.sign_polyjuice_tx(&state, raw_tx).unwrap();
-    let deploy_tx_hash: H256 = deploy_tx.hash().into();
+    let deploy_tx_hash: H256 = deploy_tx.hash();
 
     {
         let mut mem_pool = chain.mem_pool().await;
diff --git a/crates/tests/src/tests/meta_contract_args.rs b/crates/tests/src/tests/meta_contract_args.rs
index 90f89be33..59e6393ee 100644
--- a/crates/tests/src/tests/meta_contract_args.rs
+++ b/crates/tests/src/tests/meta_contract_args.rs
@@ -67,7 +67,7 @@ async fn test_backward_compatibility() {
         meta_contract_script_hash,
     )
     .unwrap();
-    let sign = register.sign_message(signing_message.into()).unwrap();
+    let sign = register.sign_message(signing_message).unwrap();
 
     let create_user_tx = L2Transaction::new_builder()
         .raw(raw_l2tx)
diff --git a/crates/tests/src/tests/polyjuice_sender_recover.rs b/crates/tests/src/tests/polyjuice_sender_recover.rs
index dc273b934..13019dc2f 100644
--- a/crates/tests/src/tests/polyjuice_sender_recover.rs
+++ b/crates/tests/src/tests/polyjuice_sender_recover.rs
@@ -39,8 +39,8 @@ async fn test_eth_account_creator() {
     let account_ctx = EthAccountContext::new(
         chain.chain_id(),
         chain.rollup_type_hash(),
-        (*ETH_ACCOUNT_LOCK_CODE_HASH).into(),
-        (*POLYJUICE_VALIDATOR_CODE_HASH).into(),
+        *ETH_ACCOUNT_LOCK_CODE_HASH,
+        *POLYJUICE_VALIDATOR_CODE_HASH,
     );
     let eth_account_creator =
         EthAccountCreator::create(&account_ctx, creator_wallet.inner).unwrap();
diff --git a/crates/tests/src/tests/restore_mem_block.rs b/crates/tests/src/tests/restore_mem_block.rs
index 0dbf50b82..ac62f1f2c 100644
--- a/crates/tests/src/tests/restore_mem_block.rs
+++ b/crates/tests/src/tests/restore_mem_block.rs
@@ -12,10 +12,11 @@ use ckb_types::prelude::{Builder, Entity};
 use ckb_vm::Bytes;
 use gw_common::builtins::ETH_REGISTRY_ACCOUNT_ID;
 use gw_common::registry_address::RegistryAddress;
-use gw_common::{state::State, H256};
+use gw_common::state::State;
 use gw_rpc_server::registry::Registry;
 use gw_store::state::history::history_state::RWConfig;
 use gw_store::state::BlockStateDB;
+use gw_types::h256::*;
 use gw_types::packed::{
     DepositInfoVec, DepositRequest, Fee, L2Transaction, RawL2Transaction, RawWithdrawalRequest,
     SUDTArgs, SUDTTransfer, Script, WithdrawalRequest, WithdrawalRequestExtra,
@@ -31,7 +32,7 @@ async fn test_restore_mem_block() {
     let _ = env_logger::builder().is_test(true).try_init();
 
     let rollup_type_script = Script::default();
-    let rollup_script_hash: H256 = rollup_type_script.hash().into();
+    let rollup_script_hash: H256 = rollup_type_script.hash();
     let mut chain = setup_chain(rollup_type_script.clone()).await;
     let rollup_context = chain.generator().rollup_context();
 
@@ -124,7 +125,7 @@ async fn test_restore_mem_block() {
         tx_accounts
             .map(|account_script| {
                 let from_id = state
-                    .get_account_id_by_script_hash(&account_script.hash().into())
+                    .get_account_id_by_script_hash(&account_script.hash())
                     .unwrap();
                 let to_script = random_always_success_script(&rollup_script_hash);
                 let to_addr =
diff --git a/crates/tests/src/tests/restore_mem_pool_pending_withdrawal.rs b/crates/tests/src/tests/restore_mem_pool_pending_withdrawal.rs
index d93a1f73e..958370c10 100644
--- a/crates/tests/src/tests/restore_mem_pool_pending_withdrawal.rs
+++ b/crates/tests/src/tests/restore_mem_pool_pending_withdrawal.rs
@@ -10,7 +10,7 @@ use crate::testing_tool::mem_pool_provider::DummyMemPoolProvider;
 
 use ckb_types::prelude::{Builder, Entity};
 use gw_chain::chain::{L1Action, L1ActionContext, SyncParam};
-use gw_common::H256;
+use gw_types::h256::*;
 use gw_types::packed::{
     CellOutput, DepositRequest, RawWithdrawalRequest, Script, WithdrawalRequest,
     WithdrawalRequestExtra,
@@ -28,7 +28,7 @@ async fn test_restore_mem_pool_pending_withdrawal() {
     let _ = env_logger::builder().is_test(true).try_init();
 
     let rollup_type_script = Script::default();
-    let rollup_script_hash: H256 = rollup_type_script.hash().into();
+    let rollup_script_hash: H256 = rollup_type_script.hash();
     let rollup_cell = CellOutput::new_builder()
         .type_(Some(rollup_type_script.clone()).pack())
         .build();
@@ -144,7 +144,7 @@ async fn test_restore_mem_pool_pending_withdrawal() {
     {
         let db = chain.store().begin_transaction();
         for withdrawal in invalid_withdrawals {
-            db.insert_mem_pool_withdrawal(&withdrawal.hash().into(), withdrawal)
+            db.insert_mem_pool_withdrawal(&withdrawal.hash(), withdrawal)
                 .unwrap();
         }
         db.commit().unwrap();
diff --git a/crates/tests/src/tests/rpc_server/execute_l2transaction.rs b/crates/tests/src/tests/rpc_server/execute_l2transaction.rs
index 5254e2ce3..e417b2f30 100644
--- a/crates/tests/src/tests/rpc_server/execute_l2transaction.rs
+++ b/crates/tests/src/tests/rpc_server/execute_l2transaction.rs
@@ -1,13 +1,11 @@
 use anyhow::anyhow;
 use ckb_types::prelude::{Builder, Entity};
-use gw_common::{
-    builtins::CKB_SUDT_ACCOUNT_ID, h256_ext::H256Ext, registry_address::RegistryAddress,
-    state::State, H256,
-};
+use gw_common::{builtins::CKB_SUDT_ACCOUNT_ID, registry_address::RegistryAddress, state::State};
 use gw_polyjuice_sender_recover::recover::error::PolyjuiceTxSenderRecoverError;
 use gw_store::state::traits::JournalDB;
 use gw_types::{
     bytes::Bytes,
+    h256::*,
     packed::{RawL2Transaction, Script},
     prelude::{Pack, Unpack},
     U256,
@@ -111,7 +109,7 @@ async fn test_polyjuice_tx_from_id_zero() {
         .build();
 
     let deploy_tx = deployer_wallet.sign_polyjuice_tx(&state, raw_tx).unwrap();
-    let deploy_tx_hash: H256 = deploy_tx.hash().into();
+    let deploy_tx_hash: H256 = deploy_tx.hash();
 
     state.finalise().unwrap();
     mem_pool_state.store_state_db(state);
@@ -211,7 +209,7 @@ async fn test_invalid_polyjuice_tx_from_id_zero() {
     let deploy_tx = deployer_wallet
         .sign_polyjuice_tx(&state, raw_tx.clone())
         .unwrap();
-    let deploy_tx_hash: H256 = deploy_tx.hash().into();
+    let deploy_tx_hash: H256 = deploy_tx.hash();
 
     state.finalise().unwrap();
     mem_pool_state.store_state_db(state);
diff --git a/crates/tests/src/tests/rpc_server/execute_raw_l2transaction.rs b/crates/tests/src/tests/rpc_server/execute_raw_l2transaction.rs
index 4531c5cdd..ccba2b68f 100644
--- a/crates/tests/src/tests/rpc_server/execute_raw_l2transaction.rs
+++ b/crates/tests/src/tests/rpc_server/execute_raw_l2transaction.rs
@@ -3,12 +3,12 @@ use gw_common::{
     builtins::{CKB_SUDT_ACCOUNT_ID, ETH_REGISTRY_ACCOUNT_ID, RESERVED_ACCOUNT_ID},
     registry_address::RegistryAddress,
     state::State,
-    H256,
 };
 use gw_generator::account_lock_manage::secp256k1::Secp256k1Eth;
 use gw_store::state::{history::history_state::RWConfig, traits::JournalDB, BlockStateDB};
 use gw_types::{
     bytes::Bytes,
+    h256::*,
     packed::{
         CreateAccount, DepositInfoVec, DepositRequest, Fee, L2Transaction, MetaContractArgs,
         RawL2Transaction, Script,
@@ -122,7 +122,7 @@ async fn test_polyjuice_tx_from_id_zero() {
         .build();
 
     let deploy_tx = deployer_wallet.sign_polyjuice_tx(&state, raw_tx).unwrap();
-    let deploy_tx_hash: H256 = deploy_tx.hash().into();
+    let deploy_tx_hash: H256 = deploy_tx.hash();
 
     state.finalise().unwrap();
     mem_pool_state.store_state_db(state);
@@ -257,7 +257,7 @@ async fn test_polyjuice_tx_from_id_zero_with_block_number() {
         meta_contract_script_hash,
     )
     .unwrap();
-    let sign = test_wallet.sign_message(signing_message.into()).unwrap();
+    let sign = test_wallet.sign_message(signing_message).unwrap();
 
     let deploy_tx = L2Transaction::new_builder()
         .raw(raw_l2tx)
@@ -272,7 +272,7 @@ async fn test_polyjuice_tx_from_id_zero_with_block_number() {
 
     // Depoly erc20 contract
     let polyjuice_account_id = state
-        .get_account_id_by_script_hash(&polyjuice_account.hash().into())
+        .get_account_id_by_script_hash(&polyjuice_account.hash())
         .unwrap()
         .unwrap();
     let deploy_args = SudtErc20ArgsBuilder::deploy(CKB_SUDT_ACCOUNT_ID, 18).finish();
@@ -285,7 +285,7 @@ async fn test_polyjuice_tx_from_id_zero_with_block_number() {
         .build();
 
     let deploy_tx = test_wallet.sign_polyjuice_tx(&state, raw_tx).unwrap();
-    let deploy_tx_hash: H256 = deploy_tx.hash().into();
+    let deploy_tx_hash: H256 = deploy_tx.hash();
 
     {
         let mut mem_pool = chain.mem_pool().await;
@@ -317,7 +317,7 @@ async fn test_polyjuice_tx_from_id_zero_with_block_number() {
     let state = mem_pool_state.load_state_db();
 
     let expect_polyjuice_account_id = state
-        .get_account_id_by_script_hash(&polyjuice_account.hash().into())
+        .get_account_id_by_script_hash(&polyjuice_account.hash())
         .unwrap()
         .unwrap();
     assert_eq!(expect_polyjuice_account_id, polyjuice_account_id);
@@ -488,7 +488,7 @@ async fn test_invalid_registry_address() {
         .build();
 
     let deploy_tx = deployer_wallet.sign_polyjuice_tx(&state, raw_tx).unwrap();
-    let deploy_tx_hash: H256 = deploy_tx.hash().into();
+    let deploy_tx_hash: H256 = deploy_tx.hash();
 
     state.finalise().unwrap();
     mem_pool_state.store_state_db(state);
diff --git a/crates/tests/src/tests/rpc_server/submit_l2transaction.rs b/crates/tests/src/tests/rpc_server/submit_l2transaction.rs
index 280c347ae..592351db5 100644
--- a/crates/tests/src/tests/rpc_server/submit_l2transaction.rs
+++ b/crates/tests/src/tests/rpc_server/submit_l2transaction.rs
@@ -2,15 +2,14 @@ use std::time::Duration;
 
 use ckb_types::prelude::{Builder, Entity};
 use gw_common::{
-    blake2b::new_blake2b,
     builtins::{CKB_SUDT_ACCOUNT_ID, ETH_REGISTRY_ACCOUNT_ID},
-    h256_ext::H256Ext,
     state::State,
-    H256,
 };
+use gw_smt::blake2b::new_blake2b;
 use gw_store::state::traits::JournalDB;
 use gw_types::{
     bytes::Bytes,
+    h256::*,
     packed::{Fee, RawL2Transaction, SUDTArgs, SUDTTransfer, Script},
     prelude::{Pack, Unpack},
     U256,
@@ -139,7 +138,7 @@ async fn test_in_queue_query_with_signature_hash() {
     let deploy_tx_hash = {
         let id = state.get_account_count().unwrap();
         let raw = raw_tx.clone().as_builder().from_id(id.pack()).build();
-        raw.hash().into()
+        raw.hash()
     };
     let deploy_tx = test_wallet.sign_polyjuice_tx(&state, raw_tx).unwrap();
 
@@ -151,7 +150,7 @@ async fn test_in_queue_query_with_signature_hash() {
         hasher.update(&sig);
         let mut hash = [0u8; 32];
         hasher.finalize(&mut hash);
-        H256::from(hash)
+        hash
     };
 
     rpc_server.submit_l2transaction(&deploy_tx).await.unwrap();
@@ -208,7 +207,7 @@ async fn test_polyjuice_tx_from_id_zero() {
     let deploy_tx_hash = {
         let id = state.get_account_count().unwrap();
         let raw = raw_tx.clone().as_builder().from_id(id.pack()).build();
-        raw.hash().into()
+        raw.hash()
     };
     let deploy_tx = test_wallet.sign_polyjuice_tx(&state, raw_tx).unwrap();
 
@@ -272,7 +271,7 @@ async fn test_polyjuice_tx_from_id_zero() {
     let deploy_tx_hash = {
         let id = expected_id;
         let raw = raw_tx.clone().as_builder().from_id(id.pack()).build();
-        raw.hash().into()
+        raw.hash()
     };
     let deploy_tx = test_wallet.sign_polyjuice_tx(&state, raw_tx).unwrap();
 
diff --git a/crates/tests/src/tests/rpc_server/submit_l2transaction/block_max_cycles_limit.rs b/crates/tests/src/tests/rpc_server/submit_l2transaction/block_max_cycles_limit.rs
index d662ec524..a18c77a9d 100644
--- a/crates/tests/src/tests/rpc_server/submit_l2transaction/block_max_cycles_limit.rs
+++ b/crates/tests/src/tests/rpc_server/submit_l2transaction/block_max_cycles_limit.rs
@@ -4,11 +4,11 @@ use ckb_types::prelude::{Builder, Entity};
 use gw_common::{
     builtins::{CKB_SUDT_ACCOUNT_ID, ETH_REGISTRY_ACCOUNT_ID, RESERVED_ACCOUNT_ID},
     state::State,
-    H256,
 };
 use gw_config::{MemBlockConfig, MemPoolConfig, SyscallCyclesConfig};
 use gw_generator::{account_lock_manage::secp256k1::Secp256k1Eth, error::TransactionError};
 use gw_types::{
+    h256::*,
     packed::{
         CreateAccount, DepositInfoVec, DepositRequest, Fee, L2Transaction, MetaContractArgs,
         RawL2Transaction, Script,
@@ -111,7 +111,7 @@ async fn test_block_max_cycles_limit() -> anyhow::Result<()> {
         meta_contract_script_hash,
     )
     .unwrap();
-    let sign = alice_wallet.sign_message(signing_message.into()).unwrap();
+    let sign = alice_wallet.sign_message(signing_message).unwrap();
 
     let deploy_tx = L2Transaction::new_builder()
         .raw(raw_tx)
@@ -134,7 +134,7 @@ async fn test_block_max_cycles_limit() -> anyhow::Result<()> {
     // We will submit two txs, expect bob's tx to be packaged in next block due to
     // block max cycles limit.
     let polyjuice_account_id = state
-        .get_account_id_by_script_hash(&polyjuice_account.hash().into())
+        .get_account_id_by_script_hash(&polyjuice_account.hash())
         .unwrap()
         .unwrap();
 
diff --git a/crates/tests/src/tests/rpc_server/submit_withdrawal_request.rs b/crates/tests/src/tests/rpc_server/submit_withdrawal_request.rs
index d7a5f79ed..40b05c808 100644
--- a/crates/tests/src/tests/rpc_server/submit_withdrawal_request.rs
+++ b/crates/tests/src/tests/rpc_server/submit_withdrawal_request.rs
@@ -4,10 +4,10 @@ use gw_common::{
     builtins::{CKB_SUDT_ACCOUNT_ID, ETH_REGISTRY_ACCOUNT_ID},
     ckb_decimal::CKBCapacity,
     state::State,
-    H256,
 };
 use gw_generator::account_lock_manage::eip712::{self, traits::EIP712Encode};
 use gw_types::{
+    h256::*,
     packed::{
         DepositInfoVec, DepositRequest, RawWithdrawalRequest, Script, WithdrawalRequest,
         WithdrawalRequestExtra,
diff --git a/crates/tests/src/tests/unlock_withdrawal_to_owner.rs b/crates/tests/src/tests/unlock_withdrawal_to_owner.rs
index 801cd0b05..d75f1e012 100644
--- a/crates/tests/src/tests/unlock_withdrawal_to_owner.rs
+++ b/crates/tests/src/tests/unlock_withdrawal_to_owner.rs
@@ -19,13 +19,13 @@ use ckb_types::prelude::{Builder, Entity};
 use gw_block_producer::produce_block::ProduceBlockResult;
 use gw_block_producer::withdrawal_unlocker::{BuildUnlockWithdrawalToOwner, Guard};
 use gw_chain::chain::{L1Action, L1ActionContext, SyncParam};
-use gw_common::h256_ext::H256Ext;
-use gw_common::smt::SMT;
-use gw_common::sparse_merkle_tree::default_store::DefaultStore;
-use gw_common::H256;
 use gw_config::ContractsCellDep;
+use gw_smt::smt::{SMT, SMTH256};
+use gw_smt::smt_h256_ext::SMTH256Ext;
+use gw_smt::sparse_merkle_tree::default_store::DefaultStore;
 use gw_types::bytes::Bytes;
 use gw_types::core::{AllowedEoaType, DepType, ScriptHashType, Timepoint};
+use gw_types::h256::H256;
 use gw_types::offchain::{
     CellInfo, CollectedCustodianCells, CompatibleFinalizedTimepoint, FinalizedCustodianCapacity,
     InputCellInfo,
@@ -164,7 +164,7 @@ async fn test_build_unlock_to_owner_tx() {
         .hash_type(ScriptHashType::Type.into())
         .args(vec![1u8; 32].pack())
         .build();
-    let rollup_script_hash: H256 = rollup_type_script.hash().into();
+    let rollup_script_hash: H256 = rollup_type_script.hash();
     let rollup_cell = CellInfo {
         data: global_state.as_bytes(),
         out_point: OutPoint::new_builder()
@@ -345,7 +345,7 @@ async fn test_build_unlock_to_owner_tx() {
             .withdrawal_extras
             .clone()
             .into_iter();
-        withdrawals.map(|w| (w.hash().into(), w))
+        withdrawals.map(|w| (w.hash(), w))
     };
     let generated_withdrawals = gw_block_producer::withdrawal::generate(
         &rollup_context,
@@ -384,10 +384,10 @@ async fn test_build_unlock_to_owner_tx() {
         }
     };
     let output_stake = {
-        let stake_block_timepoint =
+        let stake_finalized_timepoint =
             Timepoint::from_block_number(withdrawal_block_result.block.raw().number().unpack());
         let stake_lock_args = StakeLockArgs::new_builder()
-            .stake_block_timepoint(stake_block_timepoint.full_value().pack())
+            .stake_finalized_timepoint(stake_finalized_timepoint.full_value().pack())
             .build();
 
         let mut lock_args = rollup_script_hash.as_slice().to_vec();
@@ -617,10 +617,10 @@ async fn test_build_unlock_to_owner_tx() {
     assert_eq!(block_result.block.withdrawals().len(), 0);
 
     let smt_store = DefaultStore::default();
-    let mut reverted_block_smt = SMT::new(H256::zero(), smt_store);
+    let mut reverted_block_smt = SMT::new(SMTH256::zero(), smt_store);
     // Revert previous withdrawal block result
     reverted_block_smt
-        .update(withdrawal_block_result.block.hash().into(), H256::one())
+        .update(withdrawal_block_result.block.hash().into(), SMTH256::one())
         .unwrap();
 
     // Update reverted block smt root
@@ -628,7 +628,7 @@ async fn test_build_unlock_to_owner_tx() {
         global_state: block_result
             .global_state
             .as_builder()
-            .reverted_block_root(reverted_block_smt.root().pack())
+            .reverted_block_root(H256::from(*reverted_block_smt.root()).pack())
             .build(),
         ..block_result
     };
@@ -636,7 +636,7 @@ async fn test_build_unlock_to_owner_tx() {
     let input_rollup_cell = {
         let global_state = {
             let builder = deposit_finalized_global_state.as_builder();
-            builder.reverted_block_root(reverted_block_smt.root().pack())
+            builder.reverted_block_root(H256::from(*reverted_block_smt.root()).pack())
         };
         CellInfo {
             data: global_state.build().as_bytes(),
@@ -652,10 +652,10 @@ async fn test_build_unlock_to_owner_tx() {
     let output_rollup_cell = (rollup_cell.output, block_result.global_state.as_bytes());
 
     let output_stake = {
-        let stake_block_timepoint =
+        let stake_finalized_timepoint =
             Timepoint::from_block_number(block_result.block.raw().number().unpack());
         let stake_lock_args = StakeLockArgs::new_builder()
-            .stake_block_timepoint(stake_block_timepoint.full_value().pack())
+            .stake_finalized_timepoint(stake_finalized_timepoint.full_value().pack())
             .build();
 
         let mut lock_args = rollup_script_hash.as_slice().to_vec();
@@ -721,7 +721,7 @@ async fn test_build_unlock_to_owner_tx() {
 
     let reverted_block_hash = withdrawal_block_result.block.hash();
     let reverted_block_proof = {
-        let keys: Vec<H256> = vec![reverted_block_hash.into()];
+        let keys: Vec<SMTH256> = vec![reverted_block_hash.into()];
         let merkle_proof = reverted_block_smt.merkle_proof(keys.clone()).unwrap();
         merkle_proof.compile(keys).unwrap()
     };
diff --git a/crates/tools/Cargo.toml b/crates/tools/Cargo.toml
index 2b19de7e5..95ab8cfe5 100644
--- a/crates/tools/Cargo.toml
+++ b/crates/tools/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-tools"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 
@@ -28,9 +28,9 @@ ckb-crypto = "0.105.1"
 ckb-traits = "0.105.1"
 ckb-dao-utils = "0.105.1"
 gw-db = { path = "../db" }
-gw-types = { path = "../types" }
+gw-types = { path = "../../gwos/crates/types" }
 gw-config = { path = "../config" }
-gw-common = { path = "../common" }
+gw-common = { path = "../../gwos/crates/common" }
 gw-generator = { path = "../generator" }
 gw-jsonrpc-types = { path = "../jsonrpc-types" }
 gw-utils = { path = "../utils" }
diff --git a/crates/tools/src/create_creator_account.rs b/crates/tools/src/create_creator_account.rs
index 901149fa5..74e452ac3 100644
--- a/crates/tools/src/create_creator_account.rs
+++ b/crates/tools/src/create_creator_account.rs
@@ -107,7 +107,7 @@ pub async fn create_creator_account(
         let typed_tx = eip712::types::L2Transaction::from_raw(
             &raw_l2_transaction,
             sender_address,
-            receiver_script_hash.into(),
+            receiver_script_hash,
         )
         .unwrap();
         let domain_seperator = eip712::types::EIP712Domain {
diff --git a/crates/tools/src/deploy_genesis.rs b/crates/tools/src/deploy_genesis.rs
index d9aa87b5b..3845c6c5f 100644
--- a/crates/tools/src/deploy_genesis.rs
+++ b/crates/tools/src/deploy_genesis.rs
@@ -173,7 +173,7 @@ impl<'a> DeployContext<'a> {
         let tx_hash = H256::from_str(send_output.trim().trim_start_matches("0x"))?;
         log::info!("tx_hash: {:#x}", tx_hash);
         self.gw_ckb_client
-            .wait_tx_committed_with_timeout_and_logging(tx_hash.0.into(), 600)
+            .wait_tx_committed_with_timeout_and_logging(tx_hash.0, 600)
             .await?;
         Ok(tx_hash)
     }
diff --git a/crates/tools/src/deploy_scripts.rs b/crates/tools/src/deploy_scripts.rs
index 6171e3288..1659393df 100644
--- a/crates/tools/src/deploy_scripts.rs
+++ b/crates/tools/src/deploy_scripts.rs
@@ -88,10 +88,10 @@ pub async fn deploy_program(
     log::info!("tx_hash: {:#x}", tx_hash);
 
     gw_ckb_client
-        .wait_tx_committed_with_timeout_and_logging(tx_hash.0.into(), 600)
+        .wait_tx_committed_with_timeout_and_logging(tx_hash.0, 600)
         .await?;
     let tx = gw_ckb_client
-        .get_transaction(tx_hash.0.into())
+        .get_transaction(tx_hash.0)
         .await?
         .ok_or_else(|| anyhow!("tx not found"))?;
     let first_output_type_script = tx
diff --git a/crates/tools/src/deposit_ckb.rs b/crates/tools/src/deposit_ckb.rs
index c5c06937a..aa20bee9e 100644
--- a/crates/tools/src/deposit_ckb.rs
+++ b/crates/tools/src/deposit_ckb.rs
@@ -147,7 +147,7 @@ pub async fn deposit_ckb(
         log::info!("tx_hash: {:#x}", tx_hash);
 
         if let Err(e) = gw_rpc_client::ckb_client::CKBClient::with_url(ckb_rpc_url)?
-            .wait_tx_committed_with_timeout_and_logging(tx_hash.0.into(), 600)
+            .wait_tx_committed_with_timeout_and_logging(tx_hash.0, 600)
             .await
         {
             if e.to_string().contains("rejected") {
@@ -238,14 +238,16 @@ async fn get_balance_by_script_hash(
 
 // only for CKB
 fn minimal_deposit_capacity(deposit_lock_args: &DepositLockArgs) -> Result<u64> {
+    use gw_types::h256::H256Ext;
+
     // fixed size, the specific value is not important.
     let dummy_hash = gw_types::core::H256::zero();
     let dummy_timepoint = Timepoint::from_block_number(0);
     let dummy_rollup_type_hash = dummy_hash;
 
     let custodian_lock_args = CustodianLockArgs::new_builder()
-        .deposit_block_hash(dummy_hash.pack())
-        .deposit_block_timepoint(gw_types::prelude::Pack::pack(&dummy_timepoint.full_value()))
+        .deposit_block_hash(gw_types::prelude::Pack::pack(&dummy_hash))
+        .deposit_finalized_timepoint(gw_types::prelude::Pack::pack(&dummy_timepoint.full_value()))
         .deposit_lock_args(deposit_lock_args.clone())
         .build();
 
@@ -257,7 +259,7 @@ fn minimal_deposit_capacity(deposit_lock_args: &DepositLockArgs) -> Result<u64>
         .collect();
 
     let lock_script = Script::new_builder()
-        .code_hash(dummy_hash.pack())
+        .code_hash(gw_types::prelude::Pack::pack(&dummy_hash))
         .hash_type(ScriptHashType::Type.into())
         .args(gw_types::prelude::Pack::pack(&args))
         .build();
diff --git a/crates/tools/src/generate_config.rs b/crates/tools/src/generate_config.rs
index 4914525a7..150b74a48 100644
--- a/crates/tools/src/generate_config.rs
+++ b/crates/tools/src/generate_config.rs
@@ -27,7 +27,7 @@ pub struct GenerateNodeConfigArgs<'a> {
     pub scripts_deployment: &'a ScriptsDeploymentResult,
     pub privkey_path: &'a Path,
     pub ckb_url: String,
-    pub indexer_url: String,
+    pub indexer_url: Option<String>,
     pub build_scripts_result: &'a BuildScriptsResult,
     pub server_url: String,
     pub user_rollup_config: &'a UserRollupConfig,
diff --git a/crates/tools/src/main.rs b/crates/tools/src/main.rs
index 81548c4df..aa13ea282 100644
--- a/crates/tools/src/main.rs
+++ b/crates/tools/src/main.rs
@@ -75,8 +75,6 @@ async fn main() -> Result<()> {
     let arg_indexer_rpc = Arg::with_name("indexer-rpc-url")
         .long("ckb-indexer-rpc")
         .takes_value(true)
-        .default_value("http://127.0.0.1:8116")
-        .required(true)
         .help("The URL of ckb indexer");
     let arg_deployment_results_path = Arg::with_name("scripts-deployment-path")
         .long("scripts-deployment-path")
@@ -818,7 +816,7 @@ async fn main() -> Result<()> {
         .subcommand(
             SubCommand::with_name("stat-custodian-ckb")
                 .about("Output amount of layer2 custodian CKB")
-                .arg(arg_indexer_rpc.clone())
+                .arg(arg_indexer_rpc.clone().required(true))
                 .arg(
                     Arg::with_name("rollup-type-hash")
                         .long("rollup-type-hash")
@@ -938,7 +936,7 @@ async fn main() -> Result<()> {
         }
         Some(("generate-config", m)) => {
             let ckb_url = m.value_of("ckb-rpc-url").unwrap().to_string();
-            let indexer_url = m.value_of("indexer-rpc-url").unwrap().to_string();
+            let indexer_url = m.value_of("indexer-rpc-url").map(Into::into);
             let scripts_results_path = Path::new(m.value_of("scripts-deployment-path").unwrap());
             let genesis_path = Path::new(m.value_of("genesis-deployment-path").unwrap());
             let user_rollup_config_path = Path::new(m.value_of("user-rollup-config-path").unwrap());
@@ -1036,7 +1034,7 @@ async fn main() -> Result<()> {
         }
         Some(("update-cell", m)) => {
             let ckb_rpc_url = m.value_of("ckb-rpc-url").unwrap();
-            let indexer_rpc_url = m.value_of("indexer-rpc-url").unwrap();
+            let indexer_rpc_url = m.value_of("indexer-rpc-url");
             let tx_hash = cli_args::to_h256(m.value_of("tx-hash").unwrap())?;
             let index: u32 = m.value_of("index").unwrap().parse()?;
             let type_id = cli_args::to_h256(m.value_of("type-id").unwrap())?;
@@ -1116,7 +1114,7 @@ async fn main() -> Result<()> {
         }
         Some(("setup", m)) => {
             let ckb_rpc_url = m.value_of("ckb-rpc-url").unwrap();
-            let indexer_url = m.value_of("indexer-rpc-url").unwrap();
+            let indexer_url = m.value_of("indexer-rpc-url");
             let setup_config_path = Path::new(m.value_of("setup-config-path").unwrap());
             let mode = value_t!(m, "mode", prepare_scripts::ScriptsBuildMode).unwrap();
             let wallet_network = value_t!(m, "network", setup::WalletNetwork).unwrap();
@@ -1493,8 +1491,8 @@ async fn main() -> Result<()> {
 
             let stat = stat::stat_custodian_cells(
                 &rpc_client,
-                &rollup_type_hash.into(),
-                &custodian_script_type_hash.into(),
+                &rollup_type_hash,
+                &custodian_script_type_hash,
                 Some(min_capacity),
                 &compatible_finalized_timepoint,
             )
diff --git a/crates/tools/src/setup.rs b/crates/tools/src/setup.rs
index fbd5c412e..b379c6bc7 100644
--- a/crates/tools/src/setup.rs
+++ b/crates/tools/src/setup.rs
@@ -44,7 +44,7 @@ impl NodeWalletInfo {
 
 pub struct SetupArgs<'a> {
     pub ckb_rpc_url: &'a str,
-    pub indexer_url: &'a str,
+    pub indexer_url: Option<&'a str>,
     pub mode: ScriptsBuildMode,
     pub build_scripts_config_path: &'a Path,
     pub privkey_path: &'a Path,
@@ -166,7 +166,7 @@ pub async fn setup(args: SetupArgs<'_>) {
             scripts_deployment: &deploy_scripts_result,
             privkey_path: &privkey_path,
             ckb_url: ckb_rpc_url.to_string(),
-            indexer_url: indexer_url.to_string(),
+            indexer_url: indexer_url.map(Into::into),
             build_scripts_result: &build_scripts_result,
             server_url: server_url.to_string(),
             user_rollup_config: &rollup_config,
diff --git a/crates/tools/src/stat/mod.rs b/crates/tools/src/stat/mod.rs
index 28e978056..b32309f1f 100644
--- a/crates/tools/src/stat/mod.rs
+++ b/crates/tools/src/stat/mod.rs
@@ -1,7 +1,7 @@
 use anyhow::Result;
 use ckb_types::prelude::{Builder, Entity};
-use gw_common::H256;
 use gw_rpc_client::indexer_client::CKBIndexerClient;
+use gw_types::h256::*;
 use gw_types::offchain::CompatibleFinalizedTimepoint;
 use gw_types::{core::ScriptHashType, offchain::CustodianStat, packed::Script, prelude::Pack};
 
diff --git a/crates/tools/src/sudt/account.rs b/crates/tools/src/sudt/account.rs
index 65ec7d7cf..f420d009b 100644
--- a/crates/tools/src/sudt/account.rs
+++ b/crates/tools/src/sudt/account.rs
@@ -136,13 +136,12 @@ pub async fn create_sudt_account(
             .await?
             .expect("sender address")
     };
-    let receiver_script_hash: gw_common::H256 = {
+    let receiver_script_hash = {
         let hash = rpc_client
             .get_script_hash(0)
             .await
             .map_err(|err| anyhow!("{}", err))?;
-        let b: [u8; 32] = hash.into();
-        b.into()
+        hash.into()
     };
 
     let message = generate_eip712_message_to_sign(
diff --git a/crates/tools/src/sudt/transfer.rs b/crates/tools/src/sudt/transfer.rs
index 859c1619a..084909487 100644
--- a/crates/tools/src/sudt/transfer.rs
+++ b/crates/tools/src/sudt/transfer.rs
@@ -87,7 +87,7 @@ pub async fn transfer(
     let message = generate_eip712_message_to_sign(
         raw_l2transaction.to_owned(),
         sender_registry_address,
-        gw_common::H256::from(to_script_hash),
+        to_script_hash,
     );
     let signature = eth_sign(&message, privkey)?;
 
diff --git a/crates/tools/src/update_cell.rs b/crates/tools/src/update_cell.rs
index c9ced129e..265e21fd6 100644
--- a/crates/tools/src/update_cell.rs
+++ b/crates/tools/src/update_cell.rs
@@ -17,7 +17,7 @@ use std::path::{Path, PathBuf};
 
 pub struct UpdateCellArgs<'a, P> {
     pub ckb_rpc_url: &'a str,
-    pub indexer_rpc_url: &'a str,
+    pub indexer_rpc_url: Option<&'a str>,
     pub tx_hash: [u8; 32],
     pub index: u32,
     pub type_id: [u8; 32],
@@ -39,7 +39,11 @@ pub async fn update_cell<P: AsRef<Path>>(args: UpdateCellArgs<'_, P>) -> Result<
     } = args;
 
     let mut rpc_client = CkbRpcClient::new(ckb_rpc_url);
-    let indexer_client = CKBIndexerClient::with_url(indexer_rpc_url)?;
+    let indexer_client = if let Some(indexer_url) = indexer_rpc_url {
+        CKBIndexerClient::with_url(indexer_url)
+    } else {
+        CKBIndexerClient::with_ckb_url(ckb_rpc_url)
+    }?;
     // check existed_cell
     let tx_with_status = rpc_client
         .get_transaction(tx_hash.into())
@@ -153,7 +157,7 @@ pub async fn update_cell<P: AsRef<Path>>(args: UpdateCellArgs<'_, P>) -> Result<
         .map_err(|err| anyhow!("{}", err))?;
     println!("Send tx...");
     CKBClient::with_url(ckb_rpc_url)?
-        .wait_tx_committed_with_timeout_and_logging(tx_hash.0.into(), 600)
+        .wait_tx_committed_with_timeout_and_logging(tx_hash.0, 600)
         .await?;
     println!("{}", update_message);
     println!("Cell is updated!");
diff --git a/crates/tools/src/utils/message.rs b/crates/tools/src/utils/message.rs
index e37c93ad8..d7f9b4d91 100644
--- a/crates/tools/src/utils/message.rs
+++ b/crates/tools/src/utils/message.rs
@@ -42,7 +42,7 @@ pub fn generate_transaction_message_to_sign(
 pub fn generate_eip712_message_to_sign(
     raw_l2transaction: RawL2Transaction,
     sender_address: gw_common::registry_address::RegistryAddress,
-    receiver_script_hash: gw_common::H256,
+    receiver_script_hash: gw_types::h256::H256,
 ) -> H256 {
     let chain_id = raw_l2transaction.chain_id().unpack();
     let typed_tx = eip712::types::L2Transaction::from_raw(
diff --git a/crates/tools/src/withdraw.rs b/crates/tools/src/withdraw.rs
index d1be97ba6..9bae5bd40 100644
--- a/crates/tools/src/withdraw.rs
+++ b/crates/tools/src/withdraw.rs
@@ -214,6 +214,8 @@ fn parse_capacity(capacity: &str) -> Result<u64> {
 }
 
 fn minimal_withdrawal_capacity(is_sudt: bool) -> Result<u64> {
+    use gw_types::h256::H256Ext;
+
     // fixed size, the specific value is not important.
     let dummy_hash = gw_types::core::H256::zero();
     let dummy_timepoint = Timepoint::from_block_number(0);
@@ -222,7 +224,7 @@ fn minimal_withdrawal_capacity(is_sudt: bool) -> Result<u64> {
     let dummy_withdrawal_lock_args = WithdrawalLockArgs::new_builder()
         .account_script_hash(dummy_hash.pack())
         .withdrawal_block_hash(dummy_hash.pack())
-        .withdrawal_block_timepoint(dummy_timepoint.full_value().pack())
+        .withdrawal_finalized_timepoint(dummy_timepoint.full_value().pack())
         .owner_lock_hash(dummy_hash.pack())
         .build();
 
diff --git a/crates/traits/Cargo.toml b/crates/traits/Cargo.toml
index f8c4f418f..0df3549df 100644
--- a/crates/traits/Cargo.toml
+++ b/crates/traits/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "gw-traits"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-gw-types = { path = "../types" }
-gw-common = { path = "../common" }
+gw-types = { path = "../../gwos/crates/types" }
+gw-common = { path = "../../gwos/crates/common" }
 gw-db = { path = "../db" }
 anyhow = "1.0.66"
diff --git a/crates/traits/src/lib.rs b/crates/traits/src/lib.rs
index b2ea3aa24..fbf0261db 100644
--- a/crates/traits/src/lib.rs
+++ b/crates/traits/src/lib.rs
@@ -1,6 +1,5 @@
 use anyhow::Result;
-use gw_common::H256;
-use gw_types::{bytes::Bytes, packed::Script};
+use gw_types::{bytes::Bytes, h256::H256, packed::Script};
 
 pub trait CodeStore {
     fn insert_script(&mut self, script_hash: H256, script: Script);
diff --git a/crates/tx-filter/Cargo.toml b/crates/tx-filter/Cargo.toml
index bcf0c6681..a7502224e 100644
--- a/crates/tx-filter/Cargo.toml
+++ b/crates/tx-filter/Cargo.toml
@@ -1,16 +1,17 @@
 [package]
 name = "gw-tx-filter"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-gw-common = { path = "../common" }
+gw-common = { path = "../../gwos/crates/common" }
+gw-smt = { path = "../smt" }
 gw-config = { path = "../config" }
 gw-traits = { path = "../traits" }
-gw-types = { path = "../types" }
+gw-types = { path = "../../gwos/crates/types" }
 thiserror = "1.0"
 log = "0.4"
 hex = "0.4"
diff --git a/crates/tx-filter/src/erc20_creator_allowlist.rs b/crates/tx-filter/src/erc20_creator_allowlist.rs
index b3631ff8a..af29ee017 100644
--- a/crates/tx-filter/src/erc20_creator_allowlist.rs
+++ b/crates/tx-filter/src/erc20_creator_allowlist.rs
@@ -1,4 +1,4 @@
-use gw_common::H256;
+use gw_types::h256::*;
 use gw_types::offchain::RunResult;
 use log::debug;
 
diff --git a/crates/tx-filter/src/polyjuice_contract_creator_allowlist.rs b/crates/tx-filter/src/polyjuice_contract_creator_allowlist.rs
index c9ebb073c..e6c30f03e 100644
--- a/crates/tx-filter/src/polyjuice_contract_creator_allowlist.rs
+++ b/crates/tx-filter/src/polyjuice_contract_creator_allowlist.rs
@@ -1,8 +1,8 @@
 use gw_common::state::State;
-use gw_common::H256;
 use gw_config::RPCConfig;
 use gw_traits::CodeStore;
 use gw_types::bytes::Bytes;
+use gw_types::h256::*;
 use gw_types::packed::RawL2Transaction;
 use gw_types::prelude::Unpack;
 
@@ -37,7 +37,7 @@ impl PolyjuiceContractCreatorAllowList {
             &config.polyjuice_script_code_hash,
         ) {
             (Some(allowed_creator_address), Some(polyjuice_code_hash)) => Some(Self::new(
-                H256::from(polyjuice_code_hash.0),
+                polyjuice_code_hash.0,
                 allowed_creator_address
                     .iter()
                     .map(|address| address.0)
@@ -130,13 +130,13 @@ mod tests {
     use std::iter::FromIterator;
 
     use gw_common::error::Error;
-    use gw_common::smt::SMT;
-    use gw_common::sparse_merkle_tree::default_store::DefaultStore;
     use gw_common::state::State;
-    use gw_common::H256;
+    use gw_smt::smt::{SMT, SMTH256};
+    use gw_smt::sparse_merkle_tree::default_store::DefaultStore;
     use gw_traits::CodeStore;
     use gw_types::bytes::Bytes;
     use gw_types::core::ScriptHashType;
+    use gw_types::h256::*;
     use gw_types::packed::{RawL2Transaction, Script};
     use gw_types::prelude::{Builder, Entity, Pack};
 
@@ -147,7 +147,7 @@ mod tests {
 
     #[derive(Default)]
     pub struct DummyState {
-        tree: SMT<DefaultStore<H256>>,
+        tree: SMT<DefaultStore<SMTH256>>,
         account_count: u32,
         scripts: HashMap<H256, Script>,
         codes: HashMap<H256, Bytes>,
@@ -155,15 +155,21 @@ mod tests {
 
     impl State for DummyState {
         fn get_raw(&self, key: &H256) -> Result<H256, Error> {
-            let v = self.tree.get(key)?;
+            let v = self
+                .tree
+                .get(&(*key).into())
+                .map_err(|err| Error::SMT(err.to_string()))?
+                .into();
             Ok(v)
         }
         fn update_raw(&mut self, key: H256, value: H256) -> Result<(), Error> {
-            self.tree.update(key, value)?;
+            self.tree
+                .update(key.into(), value.into())
+                .map_err(|err| Error::SMT(err.to_string()))?;
             Ok(())
         }
         fn calculate_root(&self) -> Result<H256, Error> {
-            let root = *self.tree.root();
+            let root = (*self.tree.root()).into();
             Ok(root)
         }
         fn get_account_count(&self) -> Result<u32, Error> {
@@ -202,13 +208,13 @@ mod tests {
         while dummy_state.get_account_count().unwrap() < 2 {
             let mut script_hash = [0u8; 32];
             script_hash[0] = dummy_state.get_account_count().unwrap() as u8;
-            dummy_state.create_account(script_hash.into()).unwrap();
+            dummy_state.create_account(script_hash).unwrap();
         }
 
         let deployment_id = dummy_state
-            .create_account(deployment_script.hash().into())
+            .create_account(deployment_script.hash())
             .unwrap();
-        dummy_state.insert_script(deployment_script.hash().into(), deployment_script);
+        dummy_state.insert_script(deployment_script.hash(), deployment_script);
 
         let allowed_creator_id = {
             let eth_script = Script::new_builder()
@@ -216,14 +222,12 @@ mod tests {
                 .hash_type(ScriptHashType::Type.into())
                 .args([42u8; 52].pack())
                 .build();
-            dummy_state.insert_script(eth_script.hash().into(), eth_script.clone());
-            dummy_state
-                .create_account(eth_script.hash().into())
-                .unwrap()
+            dummy_state.insert_script(eth_script.hash(), eth_script.clone());
+            dummy_state.create_account(eth_script.hash()).unwrap()
         };
 
         let allowlist = PolyjuiceContractCreatorAllowList::new(
-            TEST_POLYJUICE_SCRIPT_CODE_HASH.into(),
+            TEST_POLYJUICE_SCRIPT_CODE_HASH,
             HashSet::from_iter(vec![[42u8; 20]]),
         );
 
@@ -244,10 +248,8 @@ mod tests {
                 .hash_type(ScriptHashType::Type.into())
                 .args([100u8; 52].pack())
                 .build();
-            dummy_state.insert_script(eth_script.hash().into(), eth_script.clone());
-            dummy_state
-                .create_account(eth_script.hash().into())
-                .unwrap()
+            dummy_state.insert_script(eth_script.hash(), eth_script.clone());
+            dummy_state.create_account(eth_script.hash()).unwrap()
         };
         let create_contract_tx = RawL2Transaction::new_builder()
             .from_id(non_allowed_creator_id.pack())
@@ -274,9 +276,9 @@ mod tests {
             .hash_type(ScriptHashType::Type.into())
             .build();
         let not_polyjuice_id = dummy_state
-            .create_account(not_polyjuice_script.hash().into())
+            .create_account(not_polyjuice_script.hash())
             .unwrap();
-        dummy_state.insert_script(not_polyjuice_script.hash().into(), not_polyjuice_script);
+        dummy_state.insert_script(not_polyjuice_script.hash(), not_polyjuice_script);
         let not_polyjuice_tx = RawL2Transaction::new_builder()
             .from_id(non_allowed_creator_id.pack())
             .to_id(not_polyjuice_id.pack())
diff --git a/crates/types/src/conversion/smt_h256.rs b/crates/types/src/conversion/smt_h256.rs
deleted file mode 100644
index a5853bdbb..000000000
--- a/crates/types/src/conversion/smt_h256.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-use core::convert::TryInto;
-
-use crate::core::H256;
-use crate::{packed, prelude::*, vec::Vec};
-
-impl Pack<packed::Byte32> for H256 {
-    fn pack(&self) -> packed::Byte32 {
-        packed::Byte32::from_slice(self.as_slice()).expect("impossible: fail to pack CKB H256")
-    }
-}
-
-impl<'r> Unpack<H256> for packed::Byte32Reader<'r> {
-    #[inline]
-    fn unpack(&self) -> H256 {
-        let r: [u8; 32] = self.as_slice().try_into().expect("unpack Byte32Reader");
-        r.into()
-    }
-}
-
-impl_conversion_for_entity_unpack!(H256, Byte32);
-impl_conversion_for_vector!(H256, Byte32Vec, Byte32VecReader);
diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml
index 59a347dc0..ef86c7627 100644
--- a/crates/utils/Cargo.toml
+++ b/crates/utils/Cargo.toml
@@ -1,14 +1,15 @@
 [package]
 name = "gw-utils"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-gw-types = { path = "../types" }
+gw-types = { path = "../../gwos/crates/types" }
 gw-config = { path = "../config" }
-gw-common = { path = "../common" }
+gw-common = { path = "../../gwos/crates/common" }
+gw-smt = { path = "../smt" }
 gw-rpc-client = { path = "../rpc-client" }
 gw-jsonrpc-types = { path = "../jsonrpc-types" }
 gw-store = { path = "../store" }
@@ -16,7 +17,7 @@ anyhow = "1.0"
 faster-hex = "0.4"
 ckb-crypto = "0.105.1"
 sha3 = "0.10.6"
-secp256k1 = "0.21"
+secp256k1 = "0.24"
 log = "0.4"
 rand = { version = "0.8.5", features = ["min_const_gen"] }
 ckb-types = "0.105.1"
diff --git a/crates/utils/src/calc_finalizing_range.rs b/crates/utils/src/calc_finalizing_range.rs
index 1c78681f7..732fe5779 100644
--- a/crates/utils/src/calc_finalizing_range.rs
+++ b/crates/utils/src/calc_finalizing_range.rs
@@ -1,8 +1,8 @@
+use crate::finalized_timepoint;
 use anyhow::{Context, Result};
 use gw_config::ForkConfig;
 use gw_store::traits::chain_store::ChainStore;
 use gw_types::{
-    core::Timepoint,
     offchain::CompatibleFinalizedTimepoint,
     packed::{L2Block, RollupConfig},
     prelude::*,
@@ -11,6 +11,7 @@ use std::ops::Range;
 
 // Returns true is the block of `older_block_number` is finalized for `compatible_finalized_timepoint`
 fn is_older_block_finalized(
+    rollup_config: &RollupConfig,
     fork_config: &ForkConfig,
     db: &impl ChainStore,
     compatible_finalized_timepoint: &CompatibleFinalizedTimepoint,
@@ -22,12 +23,13 @@ fn is_older_block_finalized(
     let older_block = db
         .get_block(&older_block_hash)?
         .context("get older block")?;
-    let older_timepoint = if fork_config.use_timestamp_as_timepoint(older_block_number) {
-        Timepoint::from_timestamp(older_block.raw().timestamp().unpack())
-    } else {
-        Timepoint::from_block_number(older_block_number)
-    };
-    Ok(compatible_finalized_timepoint.is_finalized(&older_timepoint))
+    let older_block_timepoint = finalized_timepoint(
+        rollup_config,
+        fork_config,
+        older_block_number,
+        older_block.raw().timestamp().unpack(),
+    );
+    Ok(compatible_finalized_timepoint.is_finalized(&older_block_timepoint))
 }
 
 // Returns the highest block that is finalized for `block`.
@@ -51,7 +53,7 @@ fn find_finalized_upper_bound(
     }
 
     let global_state = db
-        .get_block_post_global_state(&block.hash().into())?
+        .get_block_post_global_state(&block.hash())?
         .context("get current block global state")?;
     let compatible_finalized_timepoint =
         CompatibleFinalizedTimepoint::from_global_state(&global_state, finality_blocks);
@@ -68,7 +70,13 @@ fn find_finalized_upper_bound(
     let mut r = block.raw().number().unpack().saturating_sub(1);
     while l < r {
         let mid = l + (r - l + 1) / 2;
-        if is_older_block_finalized(fork_config, db, &compatible_finalized_timepoint, mid)? {
+        if is_older_block_finalized(
+            rollup_config,
+            fork_config,
+            db,
+            &compatible_finalized_timepoint,
+            mid,
+        )? {
             l = mid;
         } else {
             r = mid.saturating_sub(1);
diff --git a/crates/utils/src/export_block.rs b/crates/utils/src/export_block.rs
index 8add8c194..88533079a 100644
--- a/crates/utils/src/export_block.rs
+++ b/crates/utils/src/export_block.rs
@@ -1,12 +1,13 @@
 use std::io::{ErrorKind, Read, Seek, SeekFrom};
 
 use anyhow::{anyhow, bail, Context, Result};
-use gw_common::{h256_ext::H256Ext, H256};
+use gw_smt::smt_h256_ext::SMTH256Ext;
 use gw_store::{
     readonly::StoreReadonly, traits::chain_store::ChainStore, transaction::StoreTransaction,
 };
 use gw_types::{
     bytes::Bytes,
+    h256::*,
     offchain::ExportedBlock,
     packed::{self, GlobalState},
     prelude::{Builder, Entity, Pack, Reader, Unpack},
@@ -50,7 +51,7 @@ pub fn export_block(snap: &StoreReadonly, block_number: u64) -> Result<ExportedB
     let withdrawals = {
         let reqs = block.as_reader().withdrawals();
         let extra_reqs = reqs.iter().map(|w| {
-            let h = w.hash().into();
+            let h = w.hash();
             snap.get_withdrawal(&h)?
                 .ok_or_else(|| anyhow!("block {} withdrawal {} not found", block_number, h.pack()))
         });
@@ -180,15 +181,15 @@ pub fn insert_bad_block_hashes(
     for bad_block_hashes in bad_block_hashes_vec {
         let prev_smt_root = *reverted_block_smt.root();
         for block_hash in bad_block_hashes.iter() {
-            reverted_block_smt.update(*block_hash, H256::one())?;
+            reverted_block_smt.update((*block_hash).into(), SMTH256Ext::one())?;
         }
         tx_db.set_reverted_block_hashes(
-            reverted_block_smt.root(),
-            prev_smt_root,
+            &(*reverted_block_smt.root()).into(),
+            prev_smt_root.into(),
             bad_block_hashes,
         )?;
     }
-    tx_db.set_reverted_block_smt_root(*reverted_block_smt.root())?;
+    tx_db.set_reverted_block_smt_root((*reverted_block_smt.root()).into())?;
 
     Ok(())
 }
diff --git a/crates/utils/src/genesis_info.rs b/crates/utils/src/genesis_info.rs
index afdc9f9d6..e4f412603 100644
--- a/crates/utils/src/genesis_info.rs
+++ b/crates/utils/src/genesis_info.rs
@@ -1,7 +1,8 @@
 use anyhow::{anyhow, Result};
-use gw_common::{blake2b::new_blake2b, H256};
+use gw_common::blake2b::new_blake2b;
 use gw_types::{
     core::DepType,
+    h256::*,
     packed::{Block, CellDep, Header, OutPoint},
     prelude::*,
 };
@@ -56,25 +57,23 @@ impl CKBGenesisInfo {
                             hasher.update(&data.raw_data());
                             let mut hash = [0u8; 32];
                             hasher.finalize(&mut hash);
-                            hash.into()
+                            hash
                         };
                         if tx_index == Self::SIGHASH_OUTPUT_LOC.0
                             && index == Self::SIGHASH_OUTPUT_LOC.1
                         {
-                            sighash_type_hash =
-                                output.type_().to_opt().map(|script| script.hash().into());
+                            sighash_type_hash = output.type_().to_opt().map(|script| script.hash());
                             sighash_data_hash = Some(data_hash);
                         }
                         if tx_index == Self::MULTISIG_OUTPUT_LOC.0
                             && index == Self::MULTISIG_OUTPUT_LOC.1
                         {
                             multisig_type_hash =
-                                output.type_().to_opt().map(|script| script.hash().into());
+                                output.type_().to_opt().map(|script| script.hash());
                             multisig_data_hash = Some(data_hash);
                         }
                         if tx_index == Self::DAO_OUTPUT_LOC.0 && index == Self::DAO_OUTPUT_LOC.1 {
-                            dao_type_hash =
-                                output.type_().to_opt().map(|script| script.hash().into());
+                            dao_type_hash = output.type_().to_opt().map(|script| script.hash());
                             dao_data_hash = Some(data_hash);
                         }
                         let tx_hash = {
diff --git a/crates/utils/src/lib.rs b/crates/utils/src/lib.rs
index d44901392..18391b4ad 100644
--- a/crates/utils/src/lib.rs
+++ b/crates/utils/src/lib.rs
@@ -13,6 +13,7 @@ mod query_rollup_cell;
 mod rollup_context;
 pub mod script_log;
 pub mod since;
+pub mod timepoint;
 pub mod transaction_skeleton;
 pub mod wallet;
 pub mod withdrawal;
@@ -20,3 +21,4 @@ pub mod withdrawal;
 pub use calc_finalizing_range::calc_finalizing_range;
 pub use query_rollup_cell::query_rollup_cell;
 pub use rollup_context::RollupContext;
+pub use timepoint::{finalized_timepoint, global_state_finalized_timepoint};
diff --git a/crates/utils/src/script_log.rs b/crates/utils/src/script_log.rs
index db6539d52..725df7db4 100644
--- a/crates/utils/src/script_log.rs
+++ b/crates/utils/src/script_log.rs
@@ -1,6 +1,6 @@
 use anyhow::{anyhow, Result};
 use gw_common::registry_address::RegistryAddress;
-use gw_common::H256;
+use gw_types::h256::*;
 use gw_types::packed::LogItem;
 use gw_types::prelude::*;
 use gw_types::U256;
@@ -211,7 +211,7 @@ pub fn parse_log(item: &LogItem) -> Result<GwLog> {
                 let mut topic = [0u8; 32];
                 topic.copy_from_slice(&data[offset..offset + 32]);
                 offset += 32;
-                topics.push(topic.into());
+                topics.push(topic);
             }
             if offset != data.len() {
                 return Err(anyhow!(
diff --git a/crates/utils/src/timepoint.rs b/crates/utils/src/timepoint.rs
new file mode 100644
index 000000000..4c9eba9c5
--- /dev/null
+++ b/crates/utils/src/timepoint.rs
@@ -0,0 +1,36 @@
+use gw_config::ForkConfig;
+use gw_types::core::Timepoint;
+use gw_types::packed::RollupConfig;
+use gw_types::prelude::*;
+
+pub fn finalized_timepoint(
+    rollup_config: &RollupConfig,
+    fork_config: &ForkConfig,
+    block_number: u64,
+    block_timestamp: u64,
+) -> Timepoint {
+    if fork_config.use_timestamp_as_timepoint(block_number) {
+        // block.timepoint is in new form, represents the future finalized timestamp
+        let finality_time_in_ms = rollup_config.finality_time_in_ms();
+        Timepoint::from_timestamp(block_timestamp + finality_time_in_ms)
+    } else {
+        // block.timepoint is in legacy form, represents the its block number
+        Timepoint::from_block_number(block_number)
+    }
+}
+
+pub fn global_state_finalized_timepoint(
+    rollup_config: &RollupConfig,
+    fork_config: &ForkConfig,
+    block_number: u64,
+    block_timestamp: u64,
+) -> Timepoint {
+    if fork_config.use_timestamp_as_timepoint(block_number) {
+        // GlobalState.last_finalized_timepoint is in new form, represents the current timestamp
+        Timepoint::from_timestamp(block_timestamp)
+    } else {
+        // GlobalState.last_finalized_timepoint is in legacy form, represents the already finalized block number
+        let finality_as_blocks = rollup_config.finality_blocks().unpack();
+        Timepoint::from_block_number(block_number.saturating_sub(finality_as_blocks))
+    }
+}
diff --git a/crates/utils/src/wallet.rs b/crates/utils/src/wallet.rs
index 7a28f600f..c9a837436 100644
--- a/crates/utils/src/wallet.rs
+++ b/crates/utils/src/wallet.rs
@@ -1,11 +1,12 @@
 use anyhow::{anyhow, Context, Result};
 use ckb_crypto::secp::Privkey;
 use faster_hex::hex_decode;
-use gw_common::{blake2b::new_blake2b, H256};
+use gw_common::blake2b::new_blake2b;
 use gw_config::WalletConfig;
 use gw_types::{
     bytes::Bytes,
     core::ScriptHashType,
+    h256::*,
     packed::{Script, Transaction},
     prelude::{Builder, Entity, Pack, Unpack},
 };
diff --git a/crates/version/Cargo.toml b/crates/version/Cargo.toml
index eead4a1af..a19540d6e 100644
--- a/crates/version/Cargo.toml
+++ b/crates/version/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-version"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 
diff --git a/devtools/bump.sh b/devtools/bump.sh
index 542b047eb..7dcea6499 100755
--- a/devtools/bump.sh
+++ b/devtools/bump.sh
@@ -10,7 +10,7 @@ main() {
     exit 1
   fi
   local v="$1"
-  find ./crates -name 'Cargo.toml' -print0 | xargs -0 sed -i.bak \
+  find ./crates ./gwos/crates -name 'Cargo.toml' -print0 | xargs -0 sed -i.bak \
     -e 's/^version = .*/version = "'"$v"'"/' \
     -e 's/\({.*path = ".*",.* version = "= \)[^"]*/\1'"$v"'/'
   find . -name 'Cargo.toml.bak' -exec rm -f {} \;
diff --git a/docker/tool.sh b/docker/tool.sh
index 4f05b3b2f..edaa60d9f 100644
--- a/docker/tool.sh
+++ b/docker/tool.sh
@@ -3,7 +3,7 @@
 check_scripts_files_exists(){
     local -a arr=( 
         "eth-account-lock"   "deposit-lock"     "custodian-lock"  "stake-lock"
-        "tron-account-lock"  "withdrawal-lock"  "challenge-lock"  "omni_lock"
+        "withdrawal-lock"  "challenge-lock"  "omni_lock"
 		
         "always-success"     "state-validator"
         
diff --git a/docs/deposit_and_withdrawal.md b/docs/deposit_and_withdrawal.md
index c4e3ffe9e..f754ed08c 100644
--- a/docs/deposit_and_withdrawal.md
+++ b/docs/deposit_and_withdrawal.md
@@ -53,12 +53,12 @@ The first 32 bytes of `args` is a unique value associated with the rollup instan
 ```
 table CustodianLockArgs {
     deposit_block_hash: Byte32,
-    deposit_block_timepoint: Uint64,
+    deposit_finalized_timepoint: Uint64,
     deposit_lock_args: DepositLockArgs,
 }
 ```
 
-`CustodianLockArgs` saves the entire deposit info, `deposit_lock_args` is from the original deposit cell's args, `deposit_block_hash` and `deposit_block_timepoint` denotes the layer2 block that include the deposit.
+`CustodianLockArgs` saves the entire deposit info, `deposit_lock_args` is from the original deposit cell's args, `deposit_block_hash` and `deposit_finalized_timepoint` denotes the layer2 block that include the deposit.
 
 CKB requires `capacity` to cover the cost of the cell, the `capacity` of the deposited cell must also cover the custodian cell, so the minimal deposit CKB that Godwoken allows is as follows:
 
@@ -89,14 +89,14 @@ Withdrawal lock guarantees the cell can only be unlocked after `finality blocks`
 ```
 struct WithdrawalLockArgs {
     withdrawal_block_hash: Byte32,
-    withdrawal_block_timepoint: Uint64,
+    withdrawal_finalized_timepoint: Uint64,
     account_script_hash: Byte32,
     // layer1 lock to withdraw after challenge period
     owner_lock_hash: Byte32,
 }
 ```
 
-`withdrawal_block_hash` and `withdrawal_block_timepoint` record which layer2 block included the withdrawal. `account_script_hash` represent the layer2 account. `owner_lock_hash` represent the layer1 lock that user used to unlock the cell.
+`withdrawal_block_hash` and `withdrawal_finalized_timepoint` record which layer2 block included the withdrawal. `account_script_hash` represent the layer2 account. `owner_lock_hash` represent the layer1 lock that user used to unlock the cell.
 
 CKB requires `capacity` to cover the cost of the cell, so the minimal withdrawal CKB that Godwoken allows is as follows:
 
@@ -129,7 +129,7 @@ Withdrawal lock guarantees the cell can only be unlocked after `finality blocks`
 struct WithdrawalLockArgsV0 {
     account_script_hash: Byte32,
     withdrawal_block_hash: Byte32,
-    withdrawal_block_timepoint: Uint64,
+    withdrawal_block_number: Uint64,
     // buyer can pay sell_amount token to unlock
     sudt_script_hash: Byte32,
     sell_amount: Uint128,
diff --git a/docs/finality_mechanism_changes.md b/docs/finality_mechanism_changes.md
index c087891ee..45eac26a8 100644
--- a/docs/finality_mechanism_changes.md
+++ b/docs/finality_mechanism_changes.md
@@ -7,7 +7,7 @@ https://github.com/godwokenrises/godwoken/pull/836 changes the way to determine
 ### `Timepoint`
 
 To understand specific changes, we must understand `Timepoint`, a new underlying type introduced in https://github.com/godwokenrises/godwoken/pull/836.
-A `Timepoint` is a type, underlying `u64`, that is interpretated according to its highest bit.
+A `Timepoint` is a type, underlying `u64`, that is interpreted according to its highest bit.
 
   - When the highest bit is `0`, the rest bits are represented by block number
   - When the highest bit is `1`, the rest bits are represented by timestamp
@@ -33,11 +33,11 @@ Here are some test vectors:
 - The `timepoint_flag == 0` indicates that its `timepoint_value` is the **finalized block number**, so any blocks with a lower number are finalized.
 - The `timepoint_flag == 1` indicates that its `timepoint_value` is the **finalized timestamp**, so any blocks with a lower timestamp are finalized.
 
-### Interpretation of `WithdrawalLockArgs.withdrawal_block_timepoint`
+### Interpretation of `WithdrawalLockArgs.withdrawal_finalized_timepoint`
 
-> **NOTE**: **[`WithdrawalLockArgs.withdrawal_block_number`](https://github.com/godwokenrises/godwoken/blob/5617b579927d85509e8f88ac4fb4493ef449b642/crates/types/schemas/godwoken.mol#L206) was renamed to [`WithdrawalLockArgs.withdrawal_block_timepoint`](https://github.com/godwokenrises/godwoken/pull/836/files#diff-96e540dc83a433d447e1d2dae392fc5eafce72e839ea3900f6f1f8638aaada6bL206-R209).**
+> **NOTE**: **[`WithdrawalLockArgs.withdrawal_block_number`](https://github.com/godwokenrises/godwoken/blob/5617b579927d85509e8f88ac4fb4493ef449b642/crates/types/schemas/godwoken.mol#L206) was renamed to [`WithdrawalLockArgs.withdrawal_finalized_timepoint`](https://github.com/godwokenrises/godwoken/pull/836/files#diff-96e540dc83a433d447e1d2dae392fc5eafce72e839ea3900f6f1f8638aaada6bL206-R209).**
 
-`WithdrawalLockArgs.withdrawal_block_timepoint` was changed to type `Timepoint`:
+`WithdrawalLockArgs.withdrawal_finalized_timepoint` was changed to type `Timepoint`:
 - If `timepoint_flag == 0` then its `timepoint_value` is the **withdrawn block number**, so it becomes finalized when the tip block number exceeds `rollup_config.finality_blocks` blocks above the **withdrawn block number**.
 - If `timepoint_flag == 1` then its `timepoint_value` is the **withdrawn block timestamp**, so it becomes finalized when `GlobalState.last_finalized_timepoint` exceeds the **withdrawn block timestamp**.
 
@@ -66,7 +66,7 @@ fn is_withdrawal_finalized(
     global_state: &GlobalState,
     withdrawal_lock_args: &WithdrawalLockArgs
 ) -> bool {
-    let withdrawn_timepoint = withdrawal_lock_args.withdrawal_block_timepoint().unpack();
+    let withdrawn_timepoint = withdrawal_lock_args.withdrawal_finalized_timepoint().unpack();
     let finalized_timepoint = global_state.last_finalized_timepoint().unpack();
     let finalized_block_number = global_state.block().count().unpack() - 1 - rollup_config.finality_blocks().unpack();
 
@@ -105,7 +105,7 @@ fn estimate_future_pending_time(
     withdrawal_lock_args: &WithdrawalLockArgs,
 ) -> u64 {
     let finalized_block_number = global_state.block().count().unpack() - 1 - rollup_config.finality_blocks().unpack();
-    match Timepoint::from_full_value(withdrawal_lock_args.withdrawal_block_timepoint().unpack()) {
+    match Timepoint::from_full_value(withdrawal_lock_args.withdrawal_finalized_timepoint().unpack()) {
         Timepoint::BlockNumber(wbn) => {
             max(0, wbn - finalized_block_number) * ESTIMATE_BLOCK_INTERVAL
         }
diff --git a/docs/life_of_a_godwoken_transaction.md b/docs/life_of_a_godwoken_transaction.md
index 0e46e9efb..678eafd20 100644
--- a/docs/life_of_a_godwoken_transaction.md
+++ b/docs/life_of_a_godwoken_transaction.md
@@ -142,7 +142,7 @@ Like deposit cells, custodian cells have pre-determined `code_hash` and `hash_ty
 ```
 table CustodianLockArgs {
     deposit_block_hash: Byte32,
-    deposit_block_timepoint: Uint64,
+    deposit_finalized_timepoint: Uint64,
     // used for revert this cell to deposit request cell
     // after finalize, this lock is meaningless
     deposit_lock_args: DepositLockArgs,
diff --git a/docs/submitting_block_process.md b/docs/submitting_block_process.md
new file mode 100644
index 000000000..ce350e11c
--- /dev/null
+++ b/docs/submitting_block_process.md
@@ -0,0 +1,149 @@
+# Submitting Block Process
+
+The Submitting Block Process refers to the process by Godwoken block producers submitting a new block and global state of L2 for the chain to be updated. It is essentially a state transition. Ensuring the validity of the state transition process is one of the core responsibilities of the [_State Validator_ script](https://github.com/godwokenrises/godwoken/blob/df96ea55a87bdec118b3457173792bb4d78aae8a/gwos/contracts/state-validator/src/verifications/submit_block.rs).
+
+First, let's examine the general process of the submit block, then analyze the meaning of the various data involved and how validity is checked.
+
+---
+
+There exists a live cell, named _rollup_state_cell_, holds L2's global state, which is encoded in [`GlobalState`](https://github.com/godwokenrises/godwoken/blob/9a568d89a88344797289f5e18cf082078e246c85/crates/types/schemas/godwoken.mol#L26-L38). L2 block producer will send a L1 transaction, named _submitting_block_transaction_, to consume the live _rollup_state_cell_ and output the new _rollup_state_cell_ which holds the next global state. To enforce the transition process, or say, to enforce the validity of the updated global state, the next L2 block will be carried in _submitting_block_transaction_'s [`witness`](https://github.com/nervosnetwork/rfcs/blob/e4e53deb21f6ce58708cfcdead69526ea9355952/rfcs/0019-data-structures/0019-data-structures.md#description-2), so that the State Validator script can verify the carried L2 block and then deduce the correct global state from the verified L2 block.
+
+For convenience, we call the carried L2 block _l2block_, the consumed _rollup_state_cell_'s global state _prev_global_state_, and the output _rollup_state_cell_'s global state _post_global_state_.
+
+the State Validator script uses _prev_global_state_ as certain input to enforce the validity of _l2block_ and then enforce _post_global_state_, or say, enforce the submitting block process.
+
+## Enforce _l2block_
+In this section, I'll give the data structure of _l2block_, sourced from [`L2Block`](https://github.com/godwokenrises/godwoken/blob/6148a733fcf7b41ce25aee3a44e8f2ae6158390d/crates/types/schemas/godwoken.mol#L115-L122), and explain what each piece of information means and how we can ensure its validity.
+
+```
+table L2Block {
+    kv_state: vector KVPairVec <struct KVPair { k: Byte32, v: Byte32 }>,
+    kv_state_proof: Bytes,
+    block_proof: Bytes,
+    transactions: L2TransactionVec,
+    withdrawals: WithdrawalRequestVec,
+    raw: struct RawL2Block {
+        number: Uint64,
+        block_producer: Bytes,
+        parent_block_hash: Byte32,
+        stake_cell_owner_lock_hash: Byte32,
+        timestamp: Uint64,
+        prev_account: struct AccountMerkleState {
+            merkle_root: Byte32,
+            count: Uint32,
+        },
+        post_account: struct AccountMerkleState {
+            merkle_root: Byte32,
+            count: Uint32,
+        },
+        state_checkpoint_list: Byte32Vec,
+        submit_withdrawals: struct SubmitWithdrawals {
+            withdrawal_witness_root: Byte32,
+            withdrawal_count: Uint32,
+        },
+        submit_transactions: struct SubmitTransactions {
+            tx_witness_root: Byte32,
+            tx_count: Uint32,
+            prev_state_checkpoint: Byte32,
+        }
+    }
+}
+```
+
+- `l2block.kv_state` and `L2Block.kv_state_proof`
+  Continue to the chapter "Apply Deposits and Withdrawals.".
+  
+- `l2block.block_proof`
+  This is used for proving that the merkle tree for `post_global_state.block.merkle_root` contains the present l2block while `prev_global_state.block.merkle_root` does not.
+  Data like this does not need to be enforced since it is proof data.
+
+- `l2block.transactions`
+  This is L2 transations original data.
+
+  **The challenge mechanism in Optimistic Rollup ensures that l2block.transactions are correct.**
+
+- `l2block.withdrawals`
+  This is L2 withdrawals original data.
+
+  _The State Validator_ script must ensure there exists withdrawal cells in _submitting_block_transaction_'s outputs match the L2 withdrawals.
+
+- `l2block.raw.number`
+  Assert that `l2block.raw.number` must be equal to [`prev_global_state.block.count`](https://github.com/nervosnetwork/godwoken/blob/6148a733fcf7b41ce25aee3a44e8f2ae6158390d/crates/types/schemas/godwoken.mol#L29).
+
+- `l2block.raw.block_producer`
+  Skip due to out of topic of this article.
+
+- `l2block.raw.parent_block_hash`
+  Assert that `l2block.raw.parent_block_hash` must be equal [`prev_global_state.tip_block_hash`](https://github.com/nervosnetwork/godwoken/blob/6148a733fcf7b41ce25aee3a44e8f2ae6158390d/crates/types/schemas/godwoken.mol#L31).
+
+- `l2block.raw.stake_cell_owner_lock_hash`
+  Skip due to out of topic of this article.
+
+- `l2block.raw.timestamp`
+  Assert that `l2block.raw.timestamp` must be greater than [`prev_global_state.tip_block_timestamp`](https://github.com/nervosnetwork/godwoken/blob/6148a733fcf7b41ce25aee3a44e8f2ae6158390d/crates/types/schemas/godwoken.mol#L32), in order to enforce the increase of block timestamps; and less than `_submitting_block_transaction_.since`, in order to prevent the block timestamp from exceeding actual time.
+
+- `l2block.raw.prev_account`
+  Assert that `l2block.raw.prev_account` must be equal to [`prev_global_state.account`](https://github.com/nervosnetwork/godwoken/blob/6148a733fcf7b41ce25aee3a44e8f2ae6158390d/crates/types/schemas/godwoken.mol#L28).
+
+- `l2block.raw.post_account`
+  `l2block.raw.post_account` represents the global accounts tree, also called the World State. As defined in the blockchain protocol, the previous World State will transit to the new World State by applying deposits/withdrawals/L2Transactions included in the present _l2block._
+
+  _State Validator_ is able to apply the deposits and withdrawals(read more from chapter "Apply Deposits and Withdrawals"). However, as an Optimistic Rollup framework, Godwoken does not execute l2transactions on L1. This means the L1 scripts are not able to actually verify the _World State_ by directly applying l2transactions. Optimistic Rollup's challenge mechanism takes the responsibility to enforce the correctness of `L2Block.raw.post_account`.
+
+- `l2block.raw.state_checkpoint_list`
+  `l2block.raw.state_checkpoint_list` contains a list of checkpoints that represents the _World State_ after applying every transactions. Therefore, its length must be equal to `l2block.transactions`.
+
+   Besides, Optimistic Rollup's challenge mechanism takes the responsibility to enforce the correctness of `l2block.raw.state_checkpoint_list`.
+
+- `l2block.raw.submit_withdrawals`
+  `l2block.raw.submit_withdrawals` contains merkle commitment of withdrawals submitted by this block.
+
+- `l2block.raw.submit_transactions`
+  `l2block.raw.submit_transactions` contains merkle commitment of transactions submitted by this block.
+
+## Enforce _post_global_state_
+It's able to deduce _post_global_state_ from _prev_global_state_ and the verified _l2block_.
+
+```
+struct GlobalState {
+    rollup_config_hash: Byte32,
+    account: struct AccountMerkleState {
+	    merkle_root: Byte32,
+	    count: Uint32,
+	},
+    block: struct BlockMerkleState {
+	    merkle_root: Byte32,
+	    count: Uint64,
+	},
+    reverted_block_root: Byte32,
+    tip_block_hash: Byte32,
+    tip_block_timestamp: Uint64,
+    last_finalized_block_number: Uint64,
+    status: byte,
+    version: byte,
+}
+```
+
+- `post_global_state.rollup_config_hash`
+  This is used for identifying [rollup config](https://github.com/nervosnetwork/godwoken/blob/6148a733fcf7b41ce25aee3a44e8f2ae6158390d/crates/types/schemas/godwoken.mol#L52) and not allowed to change.
+- `post_global_state.account`
+  Assert that it is equal to `l2block.post_account`.
+- `post_global_state.block`
+  This represents the merkle tree of l2blocks. This can be deduced by `prev_global_state.block` and `l2block.block_proof`.
+- `post_global_state.reverted_block_root`
+  Skip due to out of topic of this article.
+- `post_global_state.tip_block_hash`
+  Assert that it is equal to `l2block.hash()`.
+- `post_global_state.tip_block_timestamp`
+  Assert that it is equal to `l2block.timestamp`.
+- `post_global_state.last_finalized_block_number`
+- `post_global_state.status`
+  This represents the chain status, halted or not. This is controlled by block producer.
+- `post_global_state.version`
+  This presents the consensus version of L2 chain. This is controlled by block producer. 
+
+## Apply Deposits and Withdrawals
+Deposits and withdrawals will change the target accounts balance. For example, deposit 10 CKB means that the CKB balance of L2 account will increase by 10. To enforce that the block producer has properly processed deposits/withdrawals, adding or subtracting the balance of the corresponding accounts, and to get the _World State_ afterwards correctly (will be used as the _World State_ before processing l2transactions), Godwake does this:
+1. `l2block.kv_state` contains the target accounts balance in the parent _World State_. `l2block.kv_state_proof` proves `l2block.kv_state` truly exist in the parent _World State_.
+2. _State Validator_ adds or substracts target accounts balances, initialized by `l2block.kv_state`, according to the deposits and withdrawals. Finally, we got a correct _new_kv_state_.
+3. Calculated the _World State_ by `new_kv_state.calculate_state_checkpoint()`
diff --git a/gwos-evm/Makefile b/gwos-evm/Makefile
index 37dabf2e7..f667a99ef 100644
--- a/gwos-evm/Makefile
+++ b/gwos-evm/Makefile
@@ -39,8 +39,6 @@ VALIDATOR_FLAGS := -DGW_VALIDATOR
 
 MOLC := moleculec
 MOLC_VERSION := $(shell cat $(GW_SCRIPTS)/Makefile | egrep "MOLC_VERSION :=" | awk '{print $$3}')
-PROTOCOL_VERSION := $(shell cat $(GW_SCRIPTS)/Makefile | egrep "PROTOCOL_VERSION :=" | awk '{print $$3}')
-PROTOCOL_SCHEMA_URL := https://raw.githubusercontent.com/nervosnetwork/godwoken/${PROTOCOL_VERSION}/crates/types/schemas
 
 ALL_OBJS := build/execution_state.o build/baseline.o build/analysis.o build/instruction_metrics.o build/instruction_names.o build/execution.o build/instructions.o build/instructions_calls.o build/evmone.o \
   build/keccak.o build/keccakf800.o \
@@ -83,10 +81,10 @@ clean-via-docker:
 dist: clean-via-docker all-via-docker
 
 install/ckb-binary-patcher:
-	echo "install ckb-binary-patcher from https://github.com/nervosnetwork/ckb-binary-patcher/commits/master"
-	cargo install --git https://github.com/nervosnetwork/ckb-binary-patcher.git \
-				  --rev b9489de4b3b9d59bc29bce945279bc6f28413113
-	ckb-binary-patcher --version
+	(which ckb-binary-patcher) \
+	|| (echo "install ckb-binary-patcher from https://github.com/nervosnetwork/ckb-binary-patcher/commits/master" \
+	&& cargo install --git https://github.com/nervosnetwork/ckb-binary-patcher.git \
+					 --rev b9489de4b3b9d59bc29bce945279bc6f28413113)
 patch-generator: install/ckb-binary-patcher
 	ckb-binary-patcher --remove-a -i build/generator -o build/generator.aot
 	mv build/generator build/generator.asm
@@ -210,11 +208,11 @@ check-moleculec-version:
 
 build/blockchain.mol:
 	mkdir -p build
-	curl -L -o $@ ${PROTOCOL_SCHEMA_URL}/blockchain.mol
+	cp ../gwos/crates/types/schemas/blockchain.mol $@
 
 build/godwoken.mol:
 	mkdir -p build
-	curl -L -o $@ ${PROTOCOL_SCHEMA_URL}/godwoken.mol
+	cp ../gwos/crates/types/schemas/godwoken.mol $@
 
 build/blockchain.h: build/blockchain.mol
 	${MOLC} --language c --schema-file $< > $@
diff --git a/gwos-evm/polyjuice-tests/Cargo.lock b/gwos-evm/polyjuice-tests/Cargo.lock
index 9ba3917cf..83cff27d4 100644
--- a/gwos-evm/polyjuice-tests/Cargo.lock
+++ b/gwos-evm/polyjuice-tests/Cargo.lock
@@ -24,9 +24,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.57"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc"
+checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
 
 [[package]]
 name = "arc-swap"
@@ -146,9 +146,9 @@ dependencies = [
 
 [[package]]
 name = "bitvec"
-version = "0.20.4"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
 dependencies = [
  "funty",
  "radium",
@@ -180,20 +180,13 @@ dependencies = [
 
 [[package]]
 name = "block-buffer"
-version = "0.9.0"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
+checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
 dependencies = [
- "block-padding",
  "generic-array",
 ]
 
-[[package]]
-name = "block-padding"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
-
 [[package]]
 name = "bumpalo"
 version = "3.10.0"
@@ -259,32 +252,32 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "ckb-channel"
-version = "0.104.1"
+version = "0.105.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "232566647eae9992c1e2395ae36cef0e4c510bf9ac75c996d8d355d0c0ce3079"
+checksum = "5f0da1f4e474de48b05e30ad603da4da3b410344b619c7cf35d444e406c0bb6e"
 dependencies = [
  "crossbeam-channel",
 ]
 
 [[package]]
 name = "ckb-crypto"
-version = "0.104.1"
+version = "0.105.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db6783f1d6a65df056784a088d5046448439e7706e74286626ce30a6917ab26"
+checksum = "1650275e0f5a59e8ebbd747d835e10b9179d8ab4941b96100d5b7e48fada695e"
 dependencies = [
  "ckb-fixed-hash",
  "faster-hex 0.6.1",
  "lazy_static",
  "rand 0.7.3",
- "secp256k1 0.20.3",
+ "secp256k1",
  "thiserror",
 ]
 
 [[package]]
 name = "ckb-error"
-version = "0.104.1"
+version = "0.105.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "025a5963b5c1eb565208985d7e07e0b332f8ae2f752eb9c54a1a5184123190f4"
+checksum = "51748ac5e08dce6c685cf4b43e27dcbcfc98e21442c4001c9f06509a04a400ed"
 dependencies = [
  "anyhow",
  "ckb-occupied-capacity",
@@ -294,9 +287,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-fixed-hash"
-version = "0.104.1"
+version = "0.105.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13f5ba426cc104eaf4e303b0e017b2713af68f449e2d41073e48bdc024ac281"
+checksum = "b3d665013dbb8ff2df8e67c4add67db703ae3b642679f1a2962f76399703eee1"
 dependencies = [
  "ckb-fixed-hash-core",
  "ckb-fixed-hash-macros",
@@ -304,9 +297,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-fixed-hash-core"
-version = "0.104.1"
+version = "0.105.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "952c45e5274d21078e36a40396c3a6ae28397bf534b2b6e76ff60a6eb3856bb5"
+checksum = "dd92b9d691bbfd11a900ee17ad1010a553ae0b5d3a120e0c8094afcd30f9b15e"
 dependencies = [
  "faster-hex 0.6.1",
  "serde",
@@ -315,9 +308,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-fixed-hash-macros"
-version = "0.104.1"
+version = "0.105.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6af4554a937d5307ac40c33be77319da2a71eadf67465feb4cb0ae721f8d728"
+checksum = "f24e42b82da4d891ac8b5b19de2807cae360c5377138a7cde377b60edc6ec953"
 dependencies = [
  "ckb-fixed-hash-core",
  "proc-macro2",
@@ -327,9 +320,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-hash"
-version = "0.104.1"
+version = "0.105.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ba4f6c1ffe2b03db7b91f5eb3a7894c268c7c0c5b2d340153351f13be4ff37"
+checksum = "c6b64eff869839aff45741515540e81a0447926d79262a439b5e9d0a5c98ac95"
 dependencies = [
  "blake2b-ref 0.2.1",
  "blake2b-rs",
@@ -337,9 +330,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-jsonrpc-types"
-version = "0.104.1"
+version = "0.105.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216180a0023aa336dfc0f0e68316e24079d07646d8baf3914d85b347f15c053f"
+checksum = "82268ddea09f95324496d6def1b37d6bdc3a4841fecc185388e7a2bb6451687f"
 dependencies = [
  "ckb-types",
  "faster-hex 0.6.1",
@@ -361,11 +354,20 @@ dependencies = [
  "rust-ini",
 ]
 
+[[package]]
+name = "ckb-merkle-mountain-range"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56ccb671c5921be8a84686e6212ca184cb1d7c51cadcdbfcbd1cc3f042f5dfb8"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
 [[package]]
 name = "ckb-occupied-capacity"
-version = "0.104.1"
+version = "0.105.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3356d1fde462d7ec1f7e9d5c2b86846354766e59012c9958114beeabe3a6b7f1"
+checksum = "a11e010c034a98b734074a79655c738c40501e9113426173132856a35c6e71c6"
 dependencies = [
  "ckb-occupied-capacity-core",
  "ckb-occupied-capacity-macros",
@@ -373,18 +375,18 @@ dependencies = [
 
 [[package]]
 name = "ckb-occupied-capacity-core"
-version = "0.104.1"
+version = "0.105.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e624b0276a6a95d4a3035324948f8c186a33877eb2068e82258cc59ddbd981e1"
+checksum = "03e48f0306a3fe072711e0342b71335898ac6d0a82b897ca3ae13e43770ce0e0"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "ckb-occupied-capacity-macros"
-version = "0.104.1"
+version = "0.105.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "122de59fd4f997e4e1d22dbe522f02d884d3acb2d81216635774f173a35e3353"
+checksum = "656db5615c791b8d7b31a38e024f98fb497be5e2cb120b38be48eb4d9d1d0f6d"
 dependencies = [
  "ckb-occupied-capacity-core",
  "quote",
@@ -393,9 +395,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-rational"
-version = "0.104.1"
+version = "0.105.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bea17ff1323f80aa702163a2187a98d9e4acf19f80a699c92c5d36b2e96ba57"
+checksum = "444926bc5a9ad789b2b98e75f90330bcfe741bab517ca45d8f084449fe35efd8"
 dependencies = [
  "numext-fixed-uint",
  "serde",
@@ -414,9 +416,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-types"
-version = "0.104.1"
+version = "0.105.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d94151c6b21529a7713805bacc0638ea77fefe7d36678689136d4e3407a9ed4e"
+checksum = "f06812497491fa58cea1c93dda2de074e0c5d51cf7d70d93dd50c862c661494c"
 dependencies = [
  "bit-vec",
  "bytes",
@@ -424,6 +426,7 @@ dependencies = [
  "ckb-error",
  "ckb-fixed-hash",
  "ckb-hash",
+ "ckb-merkle-mountain-range",
  "ckb-occupied-capacity",
  "ckb-rational",
  "derive_more",
@@ -435,9 +438,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-vm"
-version = "0.21.3"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc81aeacb7eaa4981e4c4f8285e30bca92f8d7346937cbcfc0b77f26b21da2de"
+checksum = "0f1126bf0240d100234bc06efa7020f0d50ca35fe90e5ac7cac1b7721e1bacb7"
 dependencies = [
  "byteorder",
  "bytes",
@@ -446,18 +449,33 @@ dependencies = [
  "derive_more",
  "goblin 0.2.3",
  "goblin 0.4.0",
- "libc",
- "mapr",
  "rand 0.7.3",
  "scroll",
  "serde",
 ]
 
+[[package]]
+name = "ckb-vm-aot"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97d90662540a6a3b0d71e58d789016efe817d2cd0c4ec6b26bcaf7f9b18fe7cf"
+dependencies = [
+ "cc",
+ "ckb-vm",
+ "ckb-vm-definitions",
+ "derive_more",
+ "goblin 0.2.3",
+ "goblin 0.4.0",
+ "libc",
+ "memmap2",
+ "scroll",
+]
+
 [[package]]
 name = "ckb-vm-definitions"
-version = "0.21.3"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7968c559498b68833791364e87182fdd1a3aba803e8a16c34b1aa45fc08add1c"
+checksum = "14739bf59648c169de9257ec7dd6aba1aeb6a41725d636005f1c91853df58fcc"
 
 [[package]]
 name = "clang-sys"
@@ -527,6 +545,16 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
 [[package]]
 name = "cty"
 version = "0.2.2"
@@ -548,11 +576,12 @@ dependencies = [
 
 [[package]]
 name = "digest"
-version = "0.9.0"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
+checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
 dependencies = [
- "generic-array",
+ "block-buffer",
+ "crypto-common",
 ]
 
 [[package]]
@@ -598,12 +627,14 @@ dependencies = [
 
 [[package]]
 name = "ethabi"
-version = "16.0.0"
+version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c98847055d934070b90e806e12d3936b787d0a115068981c1d8dfd5dfef5a5"
+checksum = "7413c5f74cc903ea37386a8965a936cbeb334bd270862fdece542c1b2dcbc898"
 dependencies = [
  "ethereum-types",
  "hex",
+ "once_cell",
+ "regex",
  "serde",
  "serde_json",
  "sha3",
@@ -613,9 +644,9 @@ dependencies = [
 
 [[package]]
 name = "ethbloom"
-version = "0.11.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfb684ac8fa8f6c5759f788862bb22ec6fe3cb392f6bfd08e3c64b603661e3f8"
+checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60"
 dependencies = [
  "crunchy",
  "fixed-hash",
@@ -626,9 +657,9 @@ dependencies = [
 
 [[package]]
 name = "ethereum-types"
-version = "0.12.1"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05136f7057fe789f06e6d41d07b34e6f70d8c86e5693b60f97aaa6553553bdaf"
+checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee"
 dependencies = [
  "ethbloom",
  "fixed-hash",
@@ -667,9 +698,9 @@ dependencies = [
 
 [[package]]
 name = "fixed-hash"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"
+checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
 dependencies = [
  "byteorder",
  "rand 0.8.5",
@@ -710,9 +741,9 @@ dependencies = [
 
 [[package]]
 name = "funty"
-version = "1.1.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
@@ -865,19 +896,18 @@ dependencies = [
 
 [[package]]
 name = "gw-common"
-version = "1.7.1"
+version = "1.8.0-rc1"
 dependencies = [
  "cfg-if 0.1.10",
  "gw-hash",
  "gw-types",
  "merkle-cbt",
- "sparse-merkle-tree",
  "thiserror",
 ]
 
 [[package]]
 name = "gw-config"
-version = "1.7.1"
+version = "1.8.0-rc1"
 dependencies = [
  "ckb-fixed-hash",
  "gw-jsonrpc-types",
@@ -887,28 +917,30 @@ dependencies = [
 
 [[package]]
 name = "gw-db"
-version = "1.7.1"
+version = "1.8.0-rc1"
 dependencies = [
+ "anyhow",
  "ckb-rocksdb",
  "gw-config",
  "libc",
  "log",
  "serde",
  "tempfile",
- "thiserror",
 ]
 
 [[package]]
 name = "gw-generator"
-version = "1.7.1"
+version = "1.8.0-rc1"
 dependencies = [
  "anyhow",
  "arc-swap",
  "blake2b-rs",
  "ckb-vm",
+ "ckb-vm-aot",
  "ethabi",
  "gw-common",
  "gw-config",
+ "gw-smt",
  "gw-store",
  "gw-traits",
  "gw-types",
@@ -917,7 +949,7 @@ dependencies = [
  "lazy_static",
  "log",
  "rlp",
- "secp256k1 0.20.3",
+ "secp256k1",
  "sha3",
  "substrate-bn",
  "thiserror",
@@ -927,14 +959,14 @@ dependencies = [
 
 [[package]]
 name = "gw-hash"
-version = "1.7.1"
+version = "1.8.0-rc1"
 dependencies = [
  "blake2b-ref 0.3.1",
 ]
 
 [[package]]
 name = "gw-jsonrpc-types"
-version = "1.7.1"
+version = "1.8.0-rc1"
 dependencies = [
  "anyhow",
  "ckb-fixed-hash",
@@ -947,7 +979,7 @@ dependencies = [
 
 [[package]]
 name = "gw-rpc-client"
-version = "1.7.1"
+version = "1.8.0-rc1"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -977,26 +1009,37 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "gw-smt"
+version = "1.8.0-rc1"
+dependencies = [
+ "cfg-if 0.1.10",
+ "gw-hash",
+ "gw-types",
+ "sparse-merkle-tree",
+]
+
 [[package]]
 name = "gw-store"
-version = "1.7.1"
+version = "1.8.0-rc1"
 dependencies = [
  "anyhow",
  "arc-swap",
  "gw-common",
  "gw-config",
  "gw-db",
+ "gw-smt",
  "gw-traits",
  "gw-types",
  "im",
  "log",
- "thiserror",
 ]
 
 [[package]]
 name = "gw-traits"
-version = "1.7.1"
+version = "1.8.0-rc1"
 dependencies = [
+ "anyhow",
  "gw-common",
  "gw-db",
  "gw-types",
@@ -1004,7 +1047,7 @@ dependencies = [
 
 [[package]]
 name = "gw-types"
-version = "1.7.1"
+version = "1.8.0-rc1"
 dependencies = [
  "cfg-if 0.1.10",
  "ckb-fixed-hash",
@@ -1012,26 +1055,28 @@ dependencies = [
  "gw-hash",
  "molecule",
  "primitive-types",
- "sparse-merkle-tree",
 ]
 
 [[package]]
 name = "gw-utils"
-version = "1.7.1"
+version = "1.8.0-rc1"
 dependencies = [
  "anyhow",
  "ckb-crypto",
  "ckb-types",
+ "ethabi",
  "faster-hex 0.4.1",
  "gw-common",
  "gw-config",
  "gw-jsonrpc-types",
  "gw-rpc-client",
+ "gw-smt",
  "gw-store",
  "gw-types",
+ "hex-literal",
  "log",
  "rand 0.8.5",
- "secp256k1 0.21.3",
+ "secp256k1",
  "sha3",
  "tokio",
  "zstd",
@@ -1095,6 +1140,12 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "hex-literal"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+
 [[package]]
 name = "http"
 version = "0.2.8"
@@ -1199,9 +1250,9 @@ dependencies = [
 
 [[package]]
 name = "impl-codec"
-version = "0.5.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443"
+checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1217,9 +1268,9 @@ dependencies = [
 
 [[package]]
 name = "impl-serde"
-version = "0.3.2"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c"
+checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd"
 dependencies = [
  "serde",
 ]
@@ -1340,16 +1391,6 @@ dependencies = [
  "cfg-if 1.0.0",
 ]
 
-[[package]]
-name = "mapr"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46a28a55dbc005b2f6f123c4058933d57add373d362f6fd3a76aab4fe6973500"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "matches"
 version = "0.1.9"
@@ -1362,6 +1403,15 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
+[[package]]
+name = "memmap2"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "merkle-cbt"
 version = "0.3.2"
@@ -1496,12 +1546,6 @@ version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
 
-[[package]]
-name = "opaque-debug"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
-
 [[package]]
 name = "openssl"
 version = "0.10.40"
@@ -1559,9 +1603,9 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec"
-version = "2.3.1"
+version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909"
+checksum = "366e44391a8af4cfd6002ef6ba072bae071a96aafca98d7d448a34c5dca38b6a"
 dependencies = [
  "arrayvec",
  "bitvec",
@@ -1573,9 +1617,9 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec-derive"
-version = "2.3.1"
+version = "3.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27"
+checksum = "9299338969a3d2f491d65f140b00ddec470858402f888af98e8642fb5e8965cd"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -1625,12 +1669,14 @@ version = "1.5.0"
 dependencies = [
  "anyhow",
  "ckb-vm",
- "ckb-vm-definitions",
+ "ckb-vm-aot",
  "env_logger 0.9.0",
+ "ethabi",
  "gw-common",
  "gw-config",
  "gw-db",
  "gw-generator",
+ "gw-smt",
  "gw-store",
  "gw-traits",
  "gw-types",
@@ -1641,6 +1687,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tiny-keccak 1.5.0",
+ "tracing",
 ]
 
 [[package]]
@@ -1651,9 +1698,9 @@ checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
 
 [[package]]
 name = "primitive-types"
-version = "0.10.1"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373"
+checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66"
 dependencies = [
  "fixed-hash",
  "impl-codec",
@@ -1675,9 +1722,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.39"
+version = "1.0.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
+checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
 dependencies = [
  "unicode-ident",
 ]
@@ -1693,9 +1740,9 @@ dependencies = [
 
 [[package]]
 name = "radium"
-version = "0.6.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
 
 [[package]]
 name = "rand"
@@ -1937,27 +1984,18 @@ dependencies = [
 
 [[package]]
 name = "secp256k1"
-version = "0.20.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97d03ceae636d0fed5bae6a7f4f664354c5f4fcedf6eef053fef17e49f837d0a"
-dependencies = [
- "secp256k1-sys",
-]
-
-[[package]]
-name = "secp256k1"
-version = "0.21.3"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c42e6f1735c5f00f51e43e28d6634141f2bcad10931b2609ddd74a86d751260"
+checksum = "ff55dc09d460954e9ef2fa8a7ced735a964be9981fd50e870b2b3b0705e14964"
 dependencies = [
  "secp256k1-sys",
 ]
 
 [[package]]
 name = "secp256k1-sys"
-version = "0.4.2"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957da2573cde917463ece3570eab4a0b3f19de6f1646cde62e6fd3868f566036"
+checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b"
 dependencies = [
  "cc",
 ]
@@ -2036,14 +2074,12 @@ dependencies = [
 
 [[package]]
 name = "sha3"
-version = "0.9.1"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809"
+checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9"
 dependencies = [
- "block-buffer",
  "digest",
  "keccak",
- "opaque-debug",
 ]
 
 [[package]]
@@ -2080,10 +2116,12 @@ dependencies = [
 
 [[package]]
 name = "sparse-merkle-tree"
-version = "0.5.3"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84214ec89cb9d304b5d54c7a266951c25bd396b2df5388420a9497a6896120a"
+checksum = "8851f6c92491ebe5528eabc1244292175a739eb0162974f9f9670a7dc748748b"
 dependencies = [
+ "blake2b-rs",
+ "cc",
  "cfg-if 0.1.10",
 ]
 
@@ -2113,9 +2151,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.96"
+version = "1.0.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf"
+checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2262,9 +2300,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
 
 [[package]]
 name = "tracing"
-version = "0.1.34"
+version = "0.1.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
 dependencies = [
  "cfg-if 1.0.0",
  "pin-project-lite",
@@ -2274,9 +2312,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.21"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c"
+checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2285,11 +2323,11 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.26"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f"
+checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
 dependencies = [
- "lazy_static",
+ "once_cell",
 ]
 
 [[package]]
@@ -2544,9 +2582,12 @@ dependencies = [
 
 [[package]]
 name = "wyz"
-version = "0.2.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
+]
 
 [[package]]
 name = "zstd"
diff --git a/gwos-evm/polyjuice-tests/Cargo.toml b/gwos-evm/polyjuice-tests/Cargo.toml
index aa4de9a3c..b50fbc115 100644
--- a/gwos-evm/polyjuice-tests/Cargo.toml
+++ b/gwos-evm/polyjuice-tests/Cargo.toml
@@ -9,16 +9,22 @@ name = "lib"
 path = "src/lib.rs"
 
 [dependencies]
-gw-types     = { path = "../../crates/types/" }
-gw-common    = { path = "../../crates/common/" }
+gw-common    = { path = "../../gwos/crates/common/" }
+gw-types     = { path = "../../gwos/crates/types/" }
+gw-smt     = { path = "../../crates/smt/" }
 gw-db        = { path = "../../crates/db/" }
 gw-store     = { path = "../../crates/store/" }
 gw-utils     = { path = "../../crates/utils/" }
 gw-config    = { path = "../../crates/config/" }
 gw-traits    = { path = "../../crates/traits/" }
 gw-generator = { path = "../../crates/generator/" }
-ckb-vm = { version = "=0.21.3", features = ["detect-asm"] }
-ckb-vm-definitions = "=0.21.3"
+
+####
+#Sync patch version with godwoken core.
+tracing = { version = "0.1.36", features = ["attributes"] } 
+ckb-vm = { version = "=0.22.0", default-features = false }
+ckb-vm-aot = { version = "=0.22.0" }
+####
 
 lazy_static = "1.4"
 tiny-keccak = "1.4"
@@ -34,4 +40,5 @@ anyhow = "1.0"
 [dev-dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
+ethabi = "18.0.0"
 
diff --git a/gwos-evm/polyjuice-tests/src/ctx.rs b/gwos-evm/polyjuice-tests/src/ctx.rs
index bcba8b127..8f22a8c2b 100644
--- a/gwos-evm/polyjuice-tests/src/ctx.rs
+++ b/gwos-evm/polyjuice-tests/src/ctx.rs
@@ -8,11 +8,11 @@ use std::{
 pub use gw_common::builtins::{CKB_SUDT_ACCOUNT_ID, ETH_REGISTRY_ACCOUNT_ID, RESERVED_ACCOUNT_ID};
 use gw_common::{
     blake2b::new_blake2b,
-    h256_ext::H256Ext,
     registry_address::RegistryAddress,
     state::{build_account_key, build_data_hash_key, State},
-    CKB_SUDT_SCRIPT_ARGS, H256,
+    CKB_SUDT_SCRIPT_ARGS,
 };
+
 use gw_config::{BackendConfig, BackendForkConfig, BackendType};
 use gw_db::schema::{COLUMN_INDEX, COLUMN_META, META_TIP_BLOCK_HASH_KEY};
 use gw_generator::{
@@ -28,6 +28,7 @@ use gw_store::{
     Store,
 };
 use gw_traits::CodeStore;
+use gw_types::h256::*;
 use gw_types::{
     bytes::Bytes,
     core::{AllowedContractType, AllowedEoaType, ScriptHashType},
@@ -58,7 +59,7 @@ pub const SECP_DATA_PATH: &str = "build/secp256k1_data";
 // pub const SECP_DATA: &[u8] = include_bytes!("../../build/secp256k1_data");
 
 // polyjuice
-pub const POLYJUICE_GENERATOR_NAME: &str = "build/generator_log.aot";
+pub const POLYJUICE_GENERATOR_NAME: &str = "build/generator_log";
 pub const POLYJUICE_VALIDATOR_NAME: &str = "build/validator";
 // ETH Address Registry
 pub const ETH_ADDRESS_REGISTRY_GENERATOR_NAME: &str =
diff --git a/gwos-evm/polyjuice-tests/src/helper.rs b/gwos-evm/polyjuice-tests/src/helper.rs
index 38f158109..3b25779f5 100644
--- a/gwos-evm/polyjuice-tests/src/helper.rs
+++ b/gwos-evm/polyjuice-tests/src/helper.rs
@@ -1,10 +1,10 @@
 use gw_common::registry_address::RegistryAddress;
 pub use gw_common::{
     blake2b::new_blake2b,
-    h256_ext::H256Ext,
     state::{build_data_hash_key, State},
-    CKB_SUDT_SCRIPT_ARGS, H256,
+    CKB_SUDT_SCRIPT_ARGS,
 };
+use gw_types::h256::*;
 
 use gw_config::{BackendConfig, BackendForkConfig, BackendType, ForkConfig};
 use gw_db::schema::{COLUMN_INDEX, COLUMN_META, META_TIP_BLOCK_HASH_KEY};
@@ -234,7 +234,7 @@ pub fn parse_log(item: &LogItem) -> Log {
                 let mut topic = [0u8; 32];
                 topic.copy_from_slice(&data[offset..offset + 32]);
                 offset += 32;
-                topics.push(topic.into());
+                topics.push(topic);
             }
             if offset != data.len() {
                 panic!(
@@ -435,7 +435,7 @@ pub fn setup() -> (Store, DummyState, Generator) {
 
     state.insert_data(*SECP_DATA_HASH, Bytes::from(SECP_DATA));
     state
-        .update_raw(build_data_hash_key(SECP_DATA_HASH.as_slice()), H256::one())
+        .update_raw(build_data_hash_key(&*SECP_DATA_HASH), H256::one())
         .expect("update secp data key");
 
     // ==== Build generator
@@ -630,7 +630,7 @@ impl MockContractInfo {
         Self {
             eth_addr: contract_eth_addr,
             eth_abi_addr: contract_eth_abi_addr,
-            script_hash: contract_script.hash().into(),
+            script_hash: contract_script.hash(),
             reg_addr,
         }
     }
diff --git a/gwos-evm/polyjuice-tests/src/lib.rs b/gwos-evm/polyjuice-tests/src/lib.rs
index 107938e0d..2651ec548 100644
--- a/gwos-evm/polyjuice-tests/src/lib.rs
+++ b/gwos-evm/polyjuice-tests/src/lib.rs
@@ -8,7 +8,7 @@ pub mod helper;
 #[allow(clippy::too_many_arguments)]
 pub(crate) mod test_cases;
 
-use gw_common::{smt::SMT, H256};
+use gw_smt::smt::SMT;
 pub use gw_store;
 use gw_store::{
     smt::smt_store::SMTStateStore,
@@ -19,10 +19,14 @@ use gw_store::{
     },
 };
 pub use gw_types;
+use gw_types::h256::*;
 
 type DummyState = MemStateDB;
 pub fn new_dummy_state(store: StoreSnapshot) -> MemStateDB {
-    let smt = SMT::new(H256::zero(), SMTStateStore::new(MemStore::new(store)));
+    let smt = SMT::new(
+        H256::zero().into(),
+        SMTStateStore::new(MemStore::new(store)),
+    );
     let inner = MemStateTree::new(smt, 0);
     MemStateDB::new(inner)
 }
diff --git a/gwos-evm/polyjuice-tests/src/test_cases/erc20.rs b/gwos-evm/polyjuice-tests/src/test_cases/erc20.rs
index f451706e7..8ffea2ce9 100644
--- a/gwos-evm/polyjuice-tests/src/test_cases/erc20.rs
+++ b/gwos-evm/polyjuice-tests/src/test_cases/erc20.rs
@@ -161,11 +161,7 @@ fn test_erc20() {
         print_gas_used(&format!("ERC20 {}: ", operation), &run_result.logs);
 
         // [ERC20 contract method_x] used cycles: 942107 < 960K
-        helper::check_cycles(
-            "ERC20 contract method_x",
-            run_result.cycles,
-            1_400_000,
-        );
+        helper::check_cycles("ERC20 contract method_x", run_result.cycles, 1_400_000);
         state.finalise().expect("update state");
         assert_eq!(
             run_result.return_data,
diff --git a/gwos-evm/polyjuice-tests/src/test_cases/fallback_function.rs b/gwos-evm/polyjuice-tests/src/test_cases/fallback_function.rs
index aea39e9f0..ef2987f98 100644
--- a/gwos-evm/polyjuice-tests/src/test_cases/fallback_function.rs
+++ b/gwos-evm/polyjuice-tests/src/test_cases/fallback_function.rs
@@ -50,11 +50,7 @@ fn test_fallback_function() {
             )
             .expect("construct");
         // [Deploy FallbackFunction] used cycles: 587271 < 590K
-        helper::check_cycles(
-            "Deploy FallbackFunction",
-            run_result.cycles,
-            920_000,
-        );
+        helper::check_cycles("Deploy FallbackFunction", run_result.cycles, 920_000);
         state.finalise().expect("update state");
     }
 
diff --git a/gwos-evm/polyjuice-tests/src/test_cases/invalid_sudt_erc20_proxy.rs b/gwos-evm/polyjuice-tests/src/test_cases/invalid_sudt_erc20_proxy.rs
index 26b11a1d5..0559849a6 100644
--- a/gwos-evm/polyjuice-tests/src/test_cases/invalid_sudt_erc20_proxy.rs
+++ b/gwos-evm/polyjuice-tests/src/test_cases/invalid_sudt_erc20_proxy.rs
@@ -150,11 +150,7 @@ fn test_invalid_sudt_erc20_proxy() {
         if *success {
             let run_result = result.expect("execute");
             // used cycles: 844202 < 870K
-            helper::check_cycles(
-                "ERC20.{balanceOf|transfer}",
-                run_result.cycles,
-                1_011_000,
-            );
+            helper::check_cycles("ERC20.{balanceOf|transfer}", run_result.cycles, 1_011_000);
             state.finalise().expect("update state");
             assert_eq!(
                 run_result.return_data,
diff --git a/gwos-evm/polyjuice-tests/src/test_cases/pre_compiled_contracts.rs b/gwos-evm/polyjuice-tests/src/test_cases/pre_compiled_contracts.rs
index 8ff94e2c3..35a55f46c 100644
--- a/gwos-evm/polyjuice-tests/src/test_cases/pre_compiled_contracts.rs
+++ b/gwos-evm/polyjuice-tests/src/test_cases/pre_compiled_contracts.rs
@@ -3,21 +3,18 @@ use crate::helper::{
     CREATOR_ACCOUNT_ID, L2TX_MAX_CYCLES, SECP_DATA, SECP_DATA_HASH,
 };
 use ckb_vm::{
-    machine::asm::{AsmCoreMachine, AsmMachine},
+    machine::asm::AsmCoreMachine,
     memory::Memory,
     registers::{A0, A1, A3, A7},
     DefaultMachineBuilder, Error as VMError, Register, SupportMachine, Syscalls,
 };
-use gw_common::{
-    h256_ext::H256Ext,
-    state::{build_data_hash_key, State},
-    H256,
-};
+use gw_common::state::{build_data_hash_key, State};
 use gw_config::SyscallCyclesConfig;
 use gw_generator::syscalls::store_data;
 use gw_store::traits::chain_store::ChainStore;
 use gw_types::{
     bytes::Bytes,
+    h256::*,
     packed::RawL2Transaction,
     prelude::{Builder, Entity, Pack},
 };
@@ -156,7 +153,8 @@ fn test_contracts() {
 
     let machine_builder =
         DefaultMachineBuilder::new(core_machine).syscall(Box::new(L2Syscalls { data, tree }));
-    let mut machine = AsmMachine::new(machine_builder.build(), None);
+
+    let mut machine = ckb_vm_aot::AotMachine::new(machine_builder.build(), None);
     machine.load_program(&binary, &[]).unwrap();
     let code = machine.run().unwrap();
     assert_eq!(code, 0);
diff --git a/gwos-evm/polyjuice-tests/src/test_cases/rlp.rs b/gwos-evm/polyjuice-tests/src/test_cases/rlp.rs
index 608d8ef1c..9a4d06269 100644
--- a/gwos-evm/polyjuice-tests/src/test_cases/rlp.rs
+++ b/gwos-evm/polyjuice-tests/src/test_cases/rlp.rs
@@ -1,9 +1,10 @@
 use ckb_vm::{
-    machine::asm::{AsmCoreMachine, AsmMachine},
+    machine::asm::AsmCoreMachine,
     memory::Memory,
     registers::{A0, A7},
     DefaultMachineBuilder, Error as VMError, Register, SupportMachine, Syscalls,
 };
+use ckb_vm_aot::AotMachine;
 
 const BINARY: &[u8] = include_bytes!("../../../build/test_rlp");
 const DEBUG_PRINT_SYSCALL_NUMBER: u64 = 2177;
@@ -85,7 +86,7 @@ fn test_rlp() {
     let core_machine = AsmCoreMachine::new(params.vm_isa, params.vm_version, 7000_0000);
 
     let machine_builder = DefaultMachineBuilder::new(core_machine).syscall(Box::new(L2Syscalls));
-    let mut machine = AsmMachine::new(machine_builder.build(), None);
+    let mut machine = AotMachine::new(machine_builder.build(), None);
     machine.load_program(&binary, &[]).unwrap();
     let code = machine.run().unwrap();
     assert_eq!(code, 0);
diff --git a/gwos-evm/polyjuice-tests/src/test_cases/selfdestruct.rs b/gwos-evm/polyjuice-tests/src/test_cases/selfdestruct.rs
index b400db99c..8878455ba 100644
--- a/gwos-evm/polyjuice-tests/src/test_cases/selfdestruct.rs
+++ b/gwos-evm/polyjuice-tests/src/test_cases/selfdestruct.rs
@@ -120,11 +120,7 @@ fn test_selfdestruct() {
             )
             .expect("construct");
         // [call SelfDestruct.done()] used cycles: 589657 < 600K
-        helper::check_cycles(
-            "call SelfDestruct.done()",
-            run_result.cycles,
-            740_000,
-        );
+        helper::check_cycles("call SelfDestruct.done()", run_result.cycles, 740_000);
         state.finalise().expect("update state");
     }
     assert_eq!(
diff --git a/gwos-evm/polyjuice-tests/src/test_cases/simple_transfer.rs b/gwos-evm/polyjuice-tests/src/test_cases/simple_transfer.rs
index b64a9828f..a4f021c06 100644
--- a/gwos-evm/polyjuice-tests/src/test_cases/simple_transfer.rs
+++ b/gwos-evm/polyjuice-tests/src/test_cases/simple_transfer.rs
@@ -171,11 +171,7 @@ fn test_simple_transfer() {
             )
             .expect("construct");
         // [SimpleTransfer to EoA] used cycles: 725217 < 736K
-        helper::check_cycles(
-            "SimpleTransfer to EoA",
-            run_result.cycles,
-            908_000,
-        );
+        helper::check_cycles("SimpleTransfer to EoA", run_result.cycles, 908_000);
         state.finalise().expect("update state");
 
         let new_balance = state
diff --git a/gwos-evm/polyjuice-tests/src/test_cases/utils.rs b/gwos-evm/polyjuice-tests/src/test_cases/utils.rs
index 02d629277..09b6d5cc8 100644
--- a/gwos-evm/polyjuice-tests/src/test_cases/utils.rs
+++ b/gwos-evm/polyjuice-tests/src/test_cases/utils.rs
@@ -1,9 +1,10 @@
 use ckb_vm::{
-    machine::asm::{AsmCoreMachine, AsmMachine},
+    machine::asm::AsmCoreMachine,
     memory::Memory,
     registers::{A0, A7},
     DefaultMachineBuilder, Error as VMError, Register, SupportMachine, Syscalls,
 };
+use ckb_vm_aot::AotMachine;
 use gw_types::bytes::Bytes;
 
 const BINARY: &[u8] = include_bytes!("../../../build/test_calc_fee");
@@ -87,7 +88,7 @@ fn test_calc_fee() {
     let cycles = 7000_0000;
     let core_machine = AsmCoreMachine::new(params.vm_isa, params.vm_version, cycles);
     let machine_builder = DefaultMachineBuilder::new(core_machine).syscall(Box::new(L2Syscalls));
-    let mut machine = AsmMachine::new(machine_builder.build(), None);
+    let mut machine = AotMachine::new(machine_builder.build(), None);
 
     machine.load_program(&binary, &[]).unwrap();
     let code = machine.run().unwrap();
diff --git a/gwos-evm/polyjuice-tests/tests/ethereum_test.rs b/gwos-evm/polyjuice-tests/tests/ethereum_test.rs
index 836f569d5..0d370bc61 100644
--- a/gwos-evm/polyjuice-tests/tests/ethereum_test.rs
+++ b/gwos-evm/polyjuice-tests/tests/ethereum_test.rs
@@ -1,4 +1,4 @@
-use gw_common::H256;
+use gw_types::h256::*;
 use gw_types::{offchain::RunResult, U256};
 use lib::{
     ctx::MockChain,
diff --git a/gwos/Cargo.lock b/gwos/Cargo.lock
index 69eb75a79..c7cad7255 100644
--- a/gwos/Cargo.lock
+++ b/gwos/Cargo.lock
@@ -86,9 +86,9 @@ dependencies = [
 
 [[package]]
 name = "fixed-hash"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"
+checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
 dependencies = [
  "static_assertions",
 ]
@@ -127,9 +127,9 @@ dependencies = [
 
 [[package]]
 name = "impl-serde"
-version = "0.3.2"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c"
+checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd"
 dependencies = [
  "serde",
 ]
@@ -172,9 +172,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "primitive-types"
-version = "0.10.1"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373"
+checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66"
 dependencies = [
  "fixed-hash",
  "impl-rlp",
diff --git a/gwos/Cargo.toml b/gwos/Cargo.toml
deleted file mode 100644
index 38a998129..000000000
--- a/gwos/Cargo.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-[workspace]
-members = [
-  "c-uint256-tests",
-]
-
-[profile.release]
-overflow-checks = true
-
-[profile.release.build-override]
-opt-level = 3
-
-[profile.bench.build-override]
-opt-level = 3
-
diff --git a/gwos/README.md b/gwos/README.md
index 476d79d72..89fdc476a 100644
--- a/gwos/README.md
+++ b/gwos/README.md
@@ -24,7 +24,6 @@ root
 │  ├─ secp256k1-utils: Secp256k1
 │  ├─ stake-lock: The lock script of stake cell
 │  ├─ state-validator: The type script constaint the on-chain operation of Rollup cell
-│  ├─ tron-account-lock: The lock script used to check Tron signatures on-chain(deprecated)
 │  ├─ withdrawal-lock: The lock script protects withdrawal cells
 ├─ tests: scripting tests
 ├─ tools: tools used in CI
@@ -73,11 +72,11 @@ The `lock` fields of the Rollup cell have relatively standalone rules, in the or
 ### Stake lock
 
 A block producer is required to provide a stake cell to perform the `RollupSubmitBlock` action.
-The stake lock args is `StakeLockArgs`, after submitting a layer-2 block, the `args.stake_block_timepoint` is updated to the latest block's timepoint.
+The stake lock args is `StakeLockArgs`, after submitting a layer-2 block, the `args.stake_finalized_timepoint` is updated to the latest block's timepoint.
 
 Stake lock can be unlocked in two paths:
 
-1. Unlock by the submitter after `args.stake_block_timepoint`'s block is finalized.
+1. Unlock by the submitter after `args.stake_finalized_timepoint`'s block is finalized.
 2. Unlock by the challenger in the `RollupRevert` action.
 
 ### Deposit lock
@@ -88,9 +87,9 @@ The sender can unlock a deposit cell after `cancel_timeout` if the deposit is no
 
 ### Custodian lock
 
-Rollup uses the custodian lock to hold the deposited assets. Custodian lock's args is a structure `CustodianLockArgs`, the field `deposit_block_timepoint` represents the block that the deposit is processed.
+Rollup uses the custodian lock to hold the deposited assets. Custodian lock's args is a structure `CustodianLockArgs`, the field `deposit_finalized_timepoint` represents the block that the deposit is processed.
 
-The `deposit_block_timepoint` also denotes whether the custodian lock is finalized or unfinalized.
+The `deposit_finalized_timepoint` also denotes whether the custodian lock is finalized or unfinalized.
 For unfinalized custodian cells, once the deposit block is reverted, these cells must be also reverted to the deposit cells.
 For finalized custodian cells, since they are finalized, we can free merge or split these cells.
 
@@ -102,7 +101,7 @@ Withdrawal cells are generated in the `RollupSubmitBlock` action according to th
 
 The withdrawal lock has two unlock paths:
 
-1. Unlock by withdrawer after the `WithdrawalLockArgs#withdrawal_block_timepoint` is finalized.
+1. Unlock by withdrawer after the `WithdrawalLockArgs#withdrawal_finalized_timepoint` is finalized.
 2. Unlock as a reverted cell in the `RollupSubmitBlock` action, a corresponded custodian cell will be generated.
 
 ### Challenge lock
diff --git a/gwos/c-uint256-tests/src/bindings.rs b/gwos/c-uint256-tests/src/bindings.rs
deleted file mode 100644
index 68fd6f90e..000000000
--- a/gwos/c-uint256-tests/src/bindings.rs
+++ /dev/null
@@ -1,168 +0,0 @@
-/* automatically generated by rust-bindgen 0.59.2 */
-
-pub const true_: u32 = 1;
-pub const false_: u32 = 0;
-pub const INT8_MIN: i32 = -128;
-pub const INT16_MIN: i32 = -32768;
-pub const INT32_MIN: i32 = -2147483648;
-pub const INT64_MIN: i64 = -9223372036854775808;
-pub const INT8_MAX: u32 = 127;
-pub const INT16_MAX: u32 = 32767;
-pub const INT32_MAX: u32 = 2147483647;
-pub const INT64_MAX: u64 = 9223372036854775807;
-pub const UINT8_MAX: u32 = 255;
-pub const UINT16_MAX: u32 = 65535;
-pub const UINT32_MAX: u32 = 4294967295;
-pub const UINT64_MAX: i32 = -1;
-pub const SIZE_MAX: i32 = -1;
-pub type size_t = ::std::os::raw::c_ulong;
-pub type ssize_t = ::std::os::raw::c_long;
-extern "C" {
-    pub fn memset(
-        dest: *mut ::std::os::raw::c_void,
-        c: ::std::os::raw::c_int,
-        n: ::std::os::raw::c_ulong,
-    ) -> *mut ::std::os::raw::c_void;
-}
-extern "C" {
-    pub fn memcpy(
-        dest: *mut ::std::os::raw::c_void,
-        src: *const ::std::os::raw::c_void,
-        n: ::std::os::raw::c_ulong,
-    ) -> *mut ::std::os::raw::c_void;
-}
-extern "C" {
-    pub fn memcmp(
-        vl: *const ::std::os::raw::c_void,
-        vr: *const ::std::os::raw::c_void,
-        n: ::std::os::raw::c_ulong,
-    ) -> ::std::os::raw::c_int;
-}
-pub type WT = size_t;
-extern "C" {
-    pub fn memmove(
-        dest: *mut ::std::os::raw::c_void,
-        src: *const ::std::os::raw::c_void,
-        n: ::std::os::raw::c_ulong,
-    ) -> *mut ::std::os::raw::c_void;
-}
-extern "C" {
-    pub fn strcpy(
-        d: *mut ::std::os::raw::c_char,
-        s: *const ::std::os::raw::c_char,
-    ) -> *mut ::std::os::raw::c_char;
-}
-extern "C" {
-    pub fn strlen(s: *const ::std::os::raw::c_char) -> ::std::os::raw::c_ulong;
-}
-extern "C" {
-    pub fn strcmp(
-        l: *const ::std::os::raw::c_char,
-        r: *const ::std::os::raw::c_char,
-    ) -> ::std::os::raw::c_int;
-}
-extern "C" {
-    pub fn malloc(size: ::std::os::raw::c_ulong) -> *mut ::std::os::raw::c_void;
-}
-extern "C" {
-    pub fn free(ptr: *mut ::std::os::raw::c_void);
-}
-extern "C" {
-    pub fn calloc(
-        nmemb: ::std::os::raw::c_ulong,
-        size: ::std::os::raw::c_ulong,
-    ) -> *mut ::std::os::raw::c_void;
-}
-extern "C" {
-    pub fn realloc(
-        ptr: *mut ::std::os::raw::c_void,
-        size: ::std::os::raw::c_ulong,
-    ) -> *mut ::std::os::raw::c_void;
-}
-pub type cmpfun = ::std::option::Option<
-    unsafe extern "C" fn(
-        arg1: *const ::std::os::raw::c_void,
-        arg2: *const ::std::os::raw::c_void,
-    ) -> ::std::os::raw::c_int,
->;
-extern "C" {
-    pub fn qsort(base: *mut ::std::os::raw::c_void, nel: size_t, width: size_t, cmp: cmpfun);
-}
-extern "C" {
-    pub fn bsearch(
-        key: *const ::std::os::raw::c_void,
-        base: *const ::std::os::raw::c_void,
-        nel: size_t,
-        width: size_t,
-        cmp: ::std::option::Option<
-            unsafe extern "C" fn(
-                arg1: *const ::std::os::raw::c_void,
-                arg2: *const ::std::os::raw::c_void,
-            ) -> ::std::os::raw::c_int,
-        >,
-    ) -> *mut ::std::os::raw::c_void;
-}
-extern "C" {
-    pub fn printf(format: *const ::std::os::raw::c_char, ...) -> ::std::os::raw::c_int;
-}
-extern "C" {
-    pub fn _start();
-}
-#[repr(C)]
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub struct uint256_t {
-    pub array: [u32; 8usize],
-}
-#[test]
-fn bindgen_test_layout_uint256_t() {
-    assert_eq!(
-        ::std::mem::size_of::<uint256_t>(),
-        32usize,
-        concat!("Size of: ", stringify!(uint256_t))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<uint256_t>(),
-        4usize,
-        concat!("Alignment of ", stringify!(uint256_t))
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<uint256_t>())).array as *const _ as usize },
-        0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(uint256_t),
-            "::",
-            stringify!(array)
-        )
-    );
-}
-extern "C" {
-    pub fn gw_uint256_zero(num: *mut uint256_t);
-}
-extern "C" {
-    pub fn gw_uint256_one(num: *mut uint256_t);
-}
-extern "C" {
-    pub fn gw_uint256_max(num: *mut uint256_t);
-}
-extern "C" {
-    pub fn gw_uint256_overflow_add(
-        a: uint256_t,
-        b: uint256_t,
-        sum: *mut uint256_t,
-    ) -> ::std::os::raw::c_int;
-}
-extern "C" {
-    pub fn gw_uint256_underflow_sub(
-        a: uint256_t,
-        b: uint256_t,
-        rem: *mut uint256_t,
-    ) -> ::std::os::raw::c_int;
-}
-pub const GW_UINT256_SMALLER: ::std::os::raw::c_int = -1;
-pub const GW_UINT256_EQUAL: ::std::os::raw::c_int = 0;
-pub const GW_UINT256_LARGER: ::std::os::raw::c_int = 1;
-pub type _bindgen_ty_1 = ::std::os::raw::c_int;
-extern "C" {
-    pub fn gw_uint256_cmp(a: uint256_t, b: uint256_t) -> ::std::os::raw::c_int;
-}
diff --git a/gwos/c/Makefile b/gwos/c/Makefile
index 72b380ab2..2953db46b 100644
--- a/gwos/c/Makefile
+++ b/gwos/c/Makefile
@@ -10,8 +10,6 @@ VALIDATOR_FLAGS := -DGW_VALIDATOR
 LDFLAGS := -Wl,-static -fdata-sections -ffunction-sections -Wl,--gc-sections
 MOLC := moleculec
 MOLC_VERSION := 0.7.2
-PROTOCOL_VERSION := bf76c19c43e4e59cfaba871e722681bf7d3d6948
-PROTOCOL_SCHEMA_URL := https://raw.githubusercontent.com/nervosnetwork/godwoken/${PROTOCOL_VERSION}/crates/types/schemas
 
 # docker pull nervos/ckb-riscv-gnu-toolchain:gnu-bionic-20191012
 BUILDER_DOCKER := nervos/ckb-riscv-gnu-toolchain@sha256:aae8a3f79705f67d505d1f1d5ddc694a4fd537ed1c7e9622420a470d59ba2ec3
@@ -130,13 +128,10 @@ fmt:
 check-moleculec-version:
 	test "$$(${MOLC} --version | awk '{ print $$2 }' | tr -d ' ')" = ${MOLC_VERSION}
 
-%.mol:
-	curl -L -o $@ ${PROTOCOL_SCHEMA_URL}/$@
-
-build/blockchain.h: blockchain.mol
+build/blockchain.h: ../crates/types/schemas/blockchain.mol
 	${MOLC} --language c --schema-file $< > $@
 
-build/godwoken.h: godwoken.mol
+build/godwoken.h: ../crates/types/schemas/godwoken.mol
 	${MOLC} --language c --schema-file $< > $@
 
 install-tools:
diff --git a/gwos/c/blockchain.mol b/gwos/c/blockchain.mol
deleted file mode 100644
index 835e15558..000000000
--- a/gwos/c/blockchain.mol
+++ /dev/null
@@ -1,120 +0,0 @@
-/* ckb v0.100.0-rc2 */
-/* Basic Types */
-
-// The `UintN` is used to store a `N` bits unsigned integer
-// as a byte array in little endian.
-array Uint16 [byte; 2];
-array Uint32 [byte; 4];
-array Uint64 [byte; 8];
-array Uint128 [byte; 16];
-array Byte32 [byte; 32];
-array Uint256 [byte; 32];
-
-vector Bytes <byte>;
-option BytesOpt (Bytes);
-
-vector BytesVec <Bytes>;
-vector Byte32Vec <Byte32>;
-
-/* Types for Chain */
-
-option ScriptOpt (Script);
-
-array ProposalShortId [byte; 10];
-
-vector UncleBlockVec <UncleBlock>;
-vector TransactionVec <Transaction>;
-vector ProposalShortIdVec <ProposalShortId>;
-vector CellDepVec <CellDep>;
-vector CellInputVec <CellInput>;
-vector CellOutputVec <CellOutput>;
-
-table Script {
-    code_hash:      Byte32,
-    hash_type:      byte,
-    args:           Bytes,
-}
-
-struct OutPoint {
-    tx_hash:        Byte32,
-    index:          Uint32,
-}
-
-struct CellInput {
-    since:           Uint64,
-    previous_output: OutPoint,
-}
-
-table CellOutput {
-    capacity:       Uint64,
-    lock:           Script,
-    type_:          ScriptOpt,
-}
-
-struct CellDep {
-    out_point:      OutPoint,
-    dep_type:       byte,
-}
-
-table RawTransaction {
-    version:        Uint32,
-    cell_deps:      CellDepVec,
-    header_deps:    Byte32Vec,
-    inputs:         CellInputVec,
-    outputs:        CellOutputVec,
-    outputs_data:   BytesVec,
-}
-
-table Transaction {
-    raw:            RawTransaction,
-    witnesses:      BytesVec,
-}
-
-struct RawHeader {
-    version:                Uint32,
-    compact_target:         Uint32,
-    timestamp:              Uint64,
-    number:                 Uint64,
-    epoch:                  Uint64,
-    parent_hash:            Byte32,
-    transactions_root:      Byte32,
-    proposals_hash:         Byte32,
-    extra_hash:             Byte32,
-    dao:                    Byte32,
-}
-
-struct Header {
-    raw:                    RawHeader,
-    nonce:                  Uint128,
-}
-
-table UncleBlock {
-    header:                 Header,
-    proposals:              ProposalShortIdVec,
-}
-
-table Block {
-    header:                 Header,
-    uncles:                 UncleBlockVec,
-    transactions:           TransactionVec,
-    proposals:              ProposalShortIdVec,
-}
-
-table BlockV1 {
-    header:                 Header,
-    uncles:                 UncleBlockVec,
-    transactions:           TransactionVec,
-    proposals:              ProposalShortIdVec,
-    extension:              Bytes,
-}
-
-table CellbaseWitness {
-    lock:    Script,
-    message: Bytes,
-}
-
-table WitnessArgs {
-    lock:                   BytesOpt,          // Lock args
-    input_type:             BytesOpt,          // Type args for input
-    output_type:            BytesOpt,          // Type args for output
-}
diff --git a/gwos/c/godwoken.mol b/gwos/c/godwoken.mol
deleted file mode 100644
index f14481033..000000000
--- a/gwos/c/godwoken.mol
+++ /dev/null
@@ -1,411 +0,0 @@
-import blockchain;
-
-vector Uint32Vec <Uint32>;
-
-struct BlockMerkleState {
-    merkle_root: Byte32,
-    count: Uint64,
-}
-
-struct AccountMerkleState {
-    merkle_root: Byte32,
-    count: Uint32,
-}
-
-struct GlobalStateV0 {
-    rollup_config_hash: Byte32,
-    account: AccountMerkleState,
-    block: BlockMerkleState,
-    reverted_block_root: Byte32,
-    tip_block_hash: Byte32,
-    last_finalized_block_number: Uint64,
-    // 0: running, 1: halting
-    status: byte,
-}
-
-struct GlobalState {
-    rollup_config_hash: Byte32,
-    account: AccountMerkleState,
-    block: BlockMerkleState,
-    reverted_block_root: Byte32,
-    tip_block_hash: Byte32,
-    tip_block_timestamp: Uint64,
-    last_finalized_block_number: Uint64,
-    // 0: running, 1: halting
-    status: byte,
-    version: byte,
-}
-
-struct AllowedTypeHash {
-    type_: byte,
-    hash: Byte32,
-}
-
-vector AllowedTypeHashVec <AllowedTypeHash>;
-
-// allowed eoa:
-// 0: unknown, 1: eth, 2: tron
-//
-// allowed contract:
-// 0: unknown, 1: meta, 2: sudt, 3: polyjuice, 4: eth addr reg
-table RollupConfig {
-    l1_sudt_script_type_hash: Byte32,
-    custodian_script_type_hash: Byte32,
-    deposit_script_type_hash: Byte32,
-    withdrawal_script_type_hash: Byte32,
-    challenge_script_type_hash: Byte32,
-    stake_script_type_hash: Byte32,
-    l2_sudt_validator_script_type_hash: Byte32,
-    burn_lock_hash: Byte32,
-    required_staking_capacity: Uint64,
-    challenge_maturity_blocks: Uint64,
-    finality_blocks: Uint64,
-    reward_burn_rate: byte, // * reward_burn_rate / 100
-    chain_id: Uint64, // chain id
-    allowed_eoa_type_hashes: AllowedTypeHashVec, // list of script code_hash allowed an EOA(external owned account) to use
-    allowed_contract_type_hashes: AllowedTypeHashVec, // list of script code_hash allowed a contract account to use
-}
-
-table RawL2Transaction {
-    // chain id
-    chain_id: Uint64,
-    from_id: Uint32,
-    to_id: Uint32,
-    nonce: Uint32,
-    args: Bytes,
-}
-
-table L2Transaction {
-    raw: RawL2Transaction,
-    signature: Bytes,
-}
-
-vector L2TransactionVec <L2Transaction>;
-
-struct SubmitTransactions {
-    tx_witness_root: Byte32,
-    tx_count: Uint32,
-    // hash(account_root | account_count) before apply all txs
-    prev_state_checkpoint: Byte32,
-}
-
-struct SubmitWithdrawals {
-    withdrawal_witness_root: Byte32,
-    withdrawal_count: Uint32,
-}
-
-table RawL2Block {
-    number: Uint64,
-    // In registry address format: registry_id (4 bytes) | address len (4 bytes) | address (n bytes)
-    block_producer: Bytes,
-    parent_block_hash: Byte32,
-    stake_cell_owner_lock_hash: Byte32,
-    timestamp: Uint64,
-    prev_account: AccountMerkleState,
-    post_account: AccountMerkleState,
-    // hash(account_root | account_count) of each withdrawals & transactions
-    state_checkpoint_list: Byte32Vec,
-    submit_withdrawals: SubmitWithdrawals,
-    submit_transactions: SubmitTransactions,
-}
-
-vector RawL2BlockVec <RawL2Block>;
-
-table L2Block {
-    raw: RawL2Block,
-    kv_state: KVPairVec,
-    kv_state_proof: Bytes,
-    transactions: L2TransactionVec,
-    block_proof: Bytes,
-    withdrawals: WithdrawalRequestVec,
-}
-
-table DepositRequest {
-    // CKB amount
-    capacity: Uint64,
-    // SUDT amount
-    amount: Uint128,
-    sudt_script_hash: Byte32,
-    script: Script,
-    // Deposit to a Godwoken registry
-    registry_id: Uint32,
-}
-
-vector DepositRequestVec <DepositRequest>;
-
-struct RawWithdrawalRequest {
-    nonce: Uint32,
-    // chain id
-    chain_id: Uint64,
-    // CKB amount
-    capacity: Uint64,
-    // SUDT amount
-    amount: Uint128,
-    sudt_script_hash: Byte32,
-    // layer2 account_script_hash
-    account_script_hash: Byte32,
-    // withdrawal registry ID
-    registry_id: Uint32,
-    // layer1 lock to withdraw after challenge period
-    owner_lock_hash: Byte32,
-    // withdrawal fee, paid to block producer
-    fee: Uint128,
-}
-
-vector WithdrawalRequestVec <WithdrawalRequest>;
-
-table WithdrawalRequest {
-    raw: RawWithdrawalRequest,
-    signature: Bytes,
-}
-
-// --- contract execution ---
-
-struct KVPair { k: Byte32, v: Byte32, }
-vector KVPairVec <KVPair>;
-
-table BlockInfo {
-    block_producer: Bytes,
-    number: Uint64,
-    timestamp: Uint64,
-}
-
-// --- end of contract execution ---
-
-// --- deposit lock ---
-// a rollup_type_hash exists before this args, to make args friendly to prefix search
-table DepositLockArgs {
-    // layer1 lock hash
-    owner_lock_hash: Byte32,
-    layer2_lock: Script,
-    cancel_timeout: Uint64,
-    registry_id: Uint32,
-}
-// --- end of deposit lock ---
-
-// --- 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_timepoint: Uint64,
-    // used for revert this cell to deposit request cell
-    // after finalize, this lock is meaningless
-    deposit_lock_args: DepositLockArgs,
-}
-
-struct UnlockCustodianViaRevertWitness {
-    deposit_lock_hash: Byte32,
-}
-
-// --- end of custodian lock ---
-
-// --- withdrawal lock ---
-// a rollup_type_hash exists before this args, to make args friendly to prefix search
-struct WithdrawalLockArgs {
-    withdrawal_block_hash: Byte32,
-    withdrawal_block_timepoint: Uint64,
-    account_script_hash: Byte32,
-    // layer1 lock to withdraw after challenge period
-    owner_lock_hash: Byte32,
-}
-
-union UnlockWithdrawalWitness {
-    UnlockWithdrawalViaFinalize,
-    UnlockWithdrawalViaRevert,
-}
-table UnlockWithdrawalViaFinalize {
-}
-struct UnlockWithdrawalViaRevert {
-    custodian_lock_hash: Byte32,
-}
-// --- end of withdrawal lock ---
-
-// --- stake lock ---
-// a rollup_type_hash exists before this args, to make args friendly to prefix search
-struct StakeLockArgs {
-    owner_lock_hash: Byte32,
-    stake_block_timepoint: Uint64,
-}
-// --- end of stake lock ---
-
-// --- builtin Meta contract ---
-union MetaContractArgs {
-    CreateAccount,
-    BatchCreateEthAccounts,
-}
-
-struct Fee {
-    // registry id
-    registry_id: Uint32,
-    // amount in CKB
-    amount: Uint128,
-}
-
-table CreateAccount {
-    script: Script,
-    fee: Fee,
-}
-
-table BatchCreateEthAccounts {
-    scripts: ScriptVec,
-    fee: Fee,
-}
-// --- end of Meta contract
-
-// --- layer2 SUDT ---
-union SUDTArgs {
-    SUDTQuery,
-    SUDTTransfer,
-}
-
-table SUDTQuery {
-    // Godwoken registry address: (registry_id (4 bytes) | address len(4 bytes) | address)
-    address: Bytes,
-}
-
-table SUDTTransfer {
-    // Godwoken registry address: (registry_id (4 bytes) | address len(4 bytes) | address)
-    to_address: Bytes,
-    amount: Uint256,
-    // paid fee(ckb)
-    fee: Fee,
-}
-// --- end of layer2 SUDT ---
-
-// --- challenge ---
-
-struct ChallengeTarget {
-    block_hash: Byte32,
-    // index of the challenge target
-    target_index: Uint32,
-    // 0: tx execution, 1: tx signature, 2: withdrawal signature
-    target_type: byte,
-}
-
-// a rollup_type_hash exists before this args, to make args friendly to prefix search
-table ChallengeLockArgs {
-    target: ChallengeTarget,
-    // layer1 lock to receive the rewards
-    rewards_receiver_lock: Script,
-}
-
-// witness to prove the validity of challenge
-table ChallengeWitness {
-    raw_l2block: RawL2Block,
-    block_proof: Bytes, // block proof
-}
-
-vector ScriptVec<Script>;
-
-struct BlockHashEntry {
-    number: Uint64,
-    hash: Byte32,
-}
-
-vector BlockHashEntryVec <BlockHashEntry>;
-
-// CKB merkle proof
-table CKBMerkleProof {
-    indices:                Uint32Vec,
-    lemmas:                 Byte32Vec,
-}
-
-// cancel challenge by execute the transaction
-table CCTransactionWitness {
-    l2tx: L2Transaction,
-    raw_l2block: RawL2Block,
-    tx_proof: CKBMerkleProof,
-    kv_state_proof: Bytes,
-    block_hashes_proof: Bytes,
-    account_count: Uint32,
-    kv_state: KVPairVec,
-    load_data: BytesVec,
-    scripts: ScriptVec,
-    return_data_hash: Byte32,
-    block_hashes: BlockHashEntryVec,
-}
-
-// cancel challenge by verify tx signature
-table CCTransactionSignatureWitness {
-    raw_l2block: RawL2Block,
-    l2tx: L2Transaction,
-    tx_proof: CKBMerkleProof,
-    kv_state: KVPairVec,
-    kv_state_proof: Bytes,
-    account_count: Uint32,
-    sender: Script,
-    receiver: Script,
-}
-
-// cancel challenge by verify witness signature
-table CCWithdrawalWitness {
-    raw_l2block: RawL2Block,
-    withdrawal: WithdrawalRequest,
-    sender: Script,
-    owner_lock: Script,
-    withdrawal_proof: CKBMerkleProof,
-    kv_state_proof: Bytes,
-    kv_state: KVPairVec,
-    account_count: Uint32,
-}
-
-// --- end of challenge ---
-
-// --- Rollup ---
-table RollupSubmitBlock {
-    block: L2Block,
-    reverted_block_hashes: Byte32Vec,
-    reverted_block_proof: Bytes,
-}
-table RollupEnterChallenge {
-    witness: ChallengeWitness,
-}
-table RollupCancelChallenge {}
-table RollupRevert {
-    reverted_blocks: RawL2BlockVec, // sorted by block number
-    block_proof: Bytes,
-    reverted_block_proof: Bytes,
-    new_tip_block: RawL2Block,
-}
-union RollupAction {
-    // submit layer2 block
-    RollupSubmitBlock,
-    // change rollup status to halting
-    RollupEnterChallenge,
-    // change rollup status to running
-    RollupCancelChallenge,
-    // revert layer2 blocks and change status to running
-    RollupRevert,
-}
-// --- end of Rollup ---
-
-
-// --- ETH Address Registry ---
-array Byte20 [byte; 20];
-
-union ETHAddrRegArgs {
-    EthToGw,
-    GwToEth,
-    SetMapping,
-    BatchSetMapping,
-}
-
-struct EthToGw {
-    eth_address: Byte20,
-}
-
-struct GwToEth {
-    gw_script_hash: Byte32,
-}
-
-struct SetMapping {
-    gw_script_hash: Byte32,
-    fee: Fee,
-}
-
-table BatchSetMapping {
-    gw_script_hashes: Byte32Vec,
-    fee: Fee,
-}
-
-// --- end of ETH Address Registry ---
diff --git a/gwos/c/gw_def.h b/gwos/c/gw_def.h
index c09665856..f31d4fac6 100644
--- a/gwos/c/gw_def.h
+++ b/gwos/c/gw_def.h
@@ -52,7 +52,6 @@ typedef unsigned __int128 uint128_t;
 
 #define GW_ALLOWED_EOA_UNKNOWN 0
 #define GW_ALLOWED_EOA_ETH 1
-#define GW_ALLOWED_EOA_TRON 2
 
 #define GW_ALLOWED_CONTRACT_UNKNOWN 0
 #define GW_ALLOWED_CONTRACT_META 1
diff --git a/gwos/capsule.toml b/gwos/capsule.toml
index bdc8bcca7..1e6d65cf6 100644
--- a/gwos/capsule.toml
+++ b/gwos/capsule.toml
@@ -2,8 +2,8 @@ version = "0.7.0"
 deployment = "deployment.toml"
 [rust]
 workspace_dir = "contracts"
-toolchain = "nightly-2021-08-16"
-docker_image = "thewawar/ckb-capsule:2021-08-16"
+toolchain = "nightly-2022-08-01"
+docker_image = "thewawar/ckb-capsule:2022-08-01"
 
 [[contracts]]
 name = "state-validator"
@@ -36,7 +36,3 @@ template_type = "Rust"
 [[contracts]]
 name = "eth-account-lock"
 template_type = "Rust"
-
-[[contracts]]
-name = "tron-account-lock"
-template_type = "Rust"
diff --git a/gwos/contracts/Cargo.lock b/gwos/contracts/Cargo.lock
index 33bff4910..56c4dae1d 100644
--- a/gwos/contracts/Cargo.lock
+++ b/gwos/contracts/Cargo.lock
@@ -116,9 +116,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-std"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5761f11372e794d77b8e8a8059b22c5d6ccef907588dd5302a669f056ecce6b"
+checksum = "47a6ad40455c446ad6fbb303dae24827fc309f43558f59d1f1b863a9de3e9f81"
 dependencies = [
  "buddy-alloc",
  "cc",
@@ -203,33 +203,21 @@ dependencies = [
 
 [[package]]
 name = "ethabi"
-version = "16.0.0"
+version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c98847055d934070b90e806e12d3936b787d0a115068981c1d8dfd5dfef5a5"
+checksum = "7413c5f74cc903ea37386a8965a936cbeb334bd270862fdece542c1b2dcbc898"
 dependencies = [
  "ethereum-types",
  "hex",
- "sha3 0.9.1",
-]
-
-[[package]]
-name = "ethbloom"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfb684ac8fa8f6c5759f788862bb22ec6fe3cb392f6bfd08e3c64b603661e3f8"
-dependencies = [
- "crunchy",
- "fixed-hash",
- "tiny-keccak",
+ "sha3 0.10.0",
 ]
 
 [[package]]
 name = "ethereum-types"
-version = "0.12.1"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05136f7057fe789f06e6d41d07b34e6f70d8c86e5693b60f97aaa6553553bdaf"
+checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee"
 dependencies = [
- "ethbloom",
  "fixed-hash",
  "primitive-types",
  "uint",
@@ -237,9 +225,9 @@ dependencies = [
 
 [[package]]
 name = "fixed-hash"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"
+checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
 dependencies = [
  "byteorder",
  "rustc-hex",
@@ -258,20 +246,17 @@ dependencies = [
 
 [[package]]
 name = "gw-common"
-version = "1.7.1"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=64f0576b527720226501fe8f0df305ce766aea0e#64f0576b527720226501fe8f0df305ce766aea0e"
+version = "1.8.0-rc1"
 dependencies = [
  "cfg-if 0.1.10",
  "gw-hash",
  "gw-types",
  "merkle-cbt",
- "sparse-merkle-tree",
 ]
 
 [[package]]
 name = "gw-hash"
-version = "1.7.1"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=64f0576b527720226501fe8f0df305ce766aea0e#64f0576b527720226501fe8f0df305ce766aea0e"
+version = "1.8.0-rc1"
 dependencies = [
  "blake2b-ref",
 ]
@@ -286,14 +271,12 @@ dependencies = [
 
 [[package]]
 name = "gw-types"
-version = "1.7.1"
-source = "git+https://github.com/nervosnetwork/godwoken.git?rev=64f0576b527720226501fe8f0df305ce766aea0e#64f0576b527720226501fe8f0df305ce766aea0e"
+version = "1.8.0-rc1"
 dependencies = [
  "cfg-if 0.1.10",
  "gw-hash",
  "molecule",
  "primitive-types",
- "sparse-merkle-tree",
 ]
 
 [[package]]
@@ -322,9 +305,9 @@ dependencies = [
 
 [[package]]
 name = "impl-serde"
-version = "0.3.2"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c"
+checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd"
 dependencies = [
  "serde",
 ]
@@ -352,9 +335,9 @@ dependencies = [
 
 [[package]]
 name = "molecule"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be5f63176422224eadd975789462a96cedaf339cd1009ef92fbdfaad39d35f5f"
+checksum = "edc8276c02a006bddad7d1c28c1a88f30421e1b5f0ba0ca96ceb8077c7d20c01"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -367,9 +350,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "primitive-types"
-version = "0.10.1"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373"
+checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66"
 dependencies = [
  "fixed-hash",
  "impl-rlp",
@@ -428,15 +411,6 @@ dependencies = [
  "keccak",
 ]
 
-[[package]]
-name = "sparse-merkle-tree"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84214ec89cb9d304b5d54c7a266951c25bd396b2df5388420a9497a6896120a"
-dependencies = [
- "cfg-if 0.1.10",
-]
-
 [[package]]
 name = "stake-lock"
 version = "0.1.0"
@@ -448,6 +422,7 @@ dependencies = [
 name = "state-validator"
 version = "0.1.0"
 dependencies = [
+ "ckb-smt",
  "gw-state",
  "gw-utils",
 ]
@@ -458,24 +433,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
-[[package]]
-name = "tiny-keccak"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
-dependencies = [
- "crunchy",
-]
-
-[[package]]
-name = "tron-account-lock"
-version = "0.1.0"
-dependencies = [
- "gw-utils",
- "secp256k1-utils",
- "sha3 0.9.1",
-]
-
 [[package]]
 name = "typenum"
 version = "1.15.0"
diff --git a/gwos/contracts/Cargo.toml b/gwos/contracts/Cargo.toml
index 321b6ad0f..c4fb237de 100644
--- a/gwos/contracts/Cargo.toml
+++ b/gwos/contracts/Cargo.toml
@@ -8,8 +8,6 @@ members = [
   "state-validator",
   "always-success",
   "eth-account-lock",
-  "tron-account-lock",
-  "secp256k1-utils",
   "ckb-smt",
   "gw-utils",
 ]
diff --git a/gwos/contracts/always-success/Cargo.toml b/gwos/contracts/always-success/Cargo.toml
index f3dc9bc70..7d2503442 100644
--- a/gwos/contracts/always-success/Cargo.toml
+++ b/gwos/contracts/always-success/Cargo.toml
@@ -6,4 +6,4 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ckb-std = "0.9.0"
+ckb-std = "0.10.0"
diff --git a/gwos/contracts/always-success/src/main.rs b/gwos/contracts/always-success/src/main.rs
index f251162c4..3a4ef07b7 100644
--- a/gwos/contracts/always-success/src/main.rs
+++ b/gwos/contracts/always-success/src/main.rs
@@ -6,13 +6,14 @@
 #![feature(lang_items)]
 #![feature(alloc_error_handler)]
 #![feature(panic_info_message)]
-#![feature(asm)]
+#![feature(asm_sym)]
 
 // define modules
 mod entry;
 mod error;
 
 use ckb_std::default_alloc;
+use core::arch::asm;
 
 ckb_std::entry!(program_entry);
 default_alloc!();
diff --git a/gwos/contracts/challenge-lock/Cargo.toml b/gwos/contracts/challenge-lock/Cargo.toml
index db0689e1e..460385a4d 100644
--- a/gwos/contracts/challenge-lock/Cargo.toml
+++ b/gwos/contracts/challenge-lock/Cargo.toml
@@ -9,5 +9,5 @@ edition = "2018"
 gw-utils = { path = "../gw-utils" }
 gw-state = { path = "../gw-state" }
 sha3 = { version = "0.10", default-features = false }
-ethabi = { version = "16", default-features = false }
+ethabi = { version = "18.0.0", default-features = false }
 rlp = { version = "0.5.0", default-features = false }
diff --git a/gwos/contracts/challenge-lock/src/main.rs b/gwos/contracts/challenge-lock/src/main.rs
index 04ec2edc1..c8b07665b 100644
--- a/gwos/contracts/challenge-lock/src/main.rs
+++ b/gwos/contracts/challenge-lock/src/main.rs
@@ -6,13 +6,14 @@
 #![feature(lang_items)]
 #![feature(alloc_error_handler)]
 #![feature(panic_info_message)]
-#![feature(asm)]
+#![feature(asm_sym)]
 
 // define modules
 mod entry;
 mod verifications;
 
 use ckb_std::default_alloc;
+use core::arch::asm;
 pub use gw_utils::ckb_std;
 
 ckb_std::entry!(program_entry);
diff --git a/gwos/contracts/challenge-lock/src/verifications/context.rs b/gwos/contracts/challenge-lock/src/verifications/context.rs
index 83ee5bf4a..369258741 100644
--- a/gwos/contracts/challenge-lock/src/verifications/context.rs
+++ b/gwos/contracts/challenge-lock/src/verifications/context.rs
@@ -1,11 +1,12 @@
 use core::result::Result;
 use gw_common::{
     builtins::ETH_REGISTRY_ACCOUNT_ID, merkle_utils::calculate_state_checkpoint,
-    registry_address::RegistryAddress, state::State, H256,
+    registry_address::RegistryAddress, state::State,
 };
 use gw_state::kv_state::KVState;
 use gw_types::{
     core::ScriptHashType,
+    h256::H256,
     packed::{ChallengeTarget, L2Transaction, RawL2Block, RollupConfig, ScriptVec},
     prelude::*,
 };
diff --git a/gwos/contracts/challenge-lock/src/verifications/eip712/types.rs b/gwos/contracts/challenge-lock/src/verifications/eip712/types.rs
index 12f8f958c..30d1b9d93 100644
--- a/gwos/contracts/challenge-lock/src/verifications/eip712/types.rs
+++ b/gwos/contracts/challenge-lock/src/verifications/eip712/types.rs
@@ -179,7 +179,7 @@ impl L2Transaction {
     pub fn from_raw(
         data: gw_utils::gw_types::packed::RawL2Transaction,
         sender_address: gw_utils::gw_common::registry_address::RegistryAddress,
-        to_script_hash: gw_utils::gw_common::H256,
+        to_script_hash: gw_utils::gw_types::h256::H256,
     ) -> Result<Self, Error> {
         let sender_address = RegistryAddress::from_address(sender_address)?;
         let tx = L2Transaction {
diff --git a/gwos/contracts/challenge-lock/src/verifications/tx_signature.rs b/gwos/contracts/challenge-lock/src/verifications/tx_signature.rs
index 4a50374f3..8cfa79286 100644
--- a/gwos/contracts/challenge-lock/src/verifications/tx_signature.rs
+++ b/gwos/contracts/challenge-lock/src/verifications/tx_signature.rs
@@ -7,6 +7,7 @@ use gw_types::{
     packed::{ChallengeLockArgs, RollupConfig},
     prelude::*,
 };
+use gw_utils::gw_types::{self, h256::H256, packed::RawL2Transaction};
 use gw_utils::{
     ckb_std::{
         ckb_constants::Source,
@@ -22,10 +23,6 @@ use gw_utils::{
     },
     signature::check_l2_account_signature_cell,
 };
-use gw_utils::{
-    gw_common::H256,
-    gw_types::{self, packed::RawL2Transaction},
-};
 use sha3::{Digest, Keccak256};
 
 /// Verify tx signature
diff --git a/gwos/contracts/challenge-lock/src/verifications/withdrawal.rs b/gwos/contracts/challenge-lock/src/verifications/withdrawal.rs
index 06d9d2236..f7a1cf125 100644
--- a/gwos/contracts/challenge-lock/src/verifications/withdrawal.rs
+++ b/gwos/contracts/challenge-lock/src/verifications/withdrawal.rs
@@ -1,13 +1,14 @@
 use crate::verifications::eip712::traits::EIP712Encode;
 use core::result::Result;
 use gw_common::{
-    builtins::ETH_REGISTRY_ACCOUNT_ID, registry_address::RegistryAddress, state::State, H256,
+    builtins::ETH_REGISTRY_ACCOUNT_ID, registry_address::RegistryAddress, state::State,
 };
 use gw_state::kv_state::KVState;
 use gw_state::{ckb_smt::smt::Pair, constants::GW_MAX_KV_PAIRS};
 use gw_types::packed::ChallengeLockArgs;
 use gw_utils::gw_types::{
     self,
+    h256::H256,
     packed::{RollupConfig, Script, WithdrawalRequest},
     prelude::*,
 };
diff --git a/gwos/contracts/ckb-smt/build.rs b/gwos/contracts/ckb-smt/build.rs
index 32556bd08..38ff924d9 100644
--- a/gwos/contracts/ckb-smt/build.rs
+++ b/gwos/contracts/ckb-smt/build.rs
@@ -22,6 +22,8 @@ fn main() {
         .flag("-fdata-sections")
         .flag("-ffunction-sections")
         .flag("-Wl,--gc-sections")
+        // blake2b
+        .include("c")
         // sparse-merkle-tree
         .include("c/deps/sparse-merkle-tree/c")
         // ckb-c-stdlib
diff --git a/gwos/contracts/custodian-lock/src/entry.rs b/gwos/contracts/custodian-lock/src/entry.rs
index 9d9382623..4ce181d95 100644
--- a/gwos/contracts/custodian-lock/src/entry.rs
+++ b/gwos/contracts/custodian-lock/src/entry.rs
@@ -64,7 +64,7 @@ pub fn main() -> Result<(), Error> {
     let is_finalized = is_finalized(
         &config,
         &global_state,
-        &Timepoint::from_full_value(lock_args.deposit_block_timepoint().unpack()),
+        &Timepoint::from_full_value(lock_args.deposit_finalized_timepoint().unpack()),
     );
     if is_finalized {
         // this custodian lock is already finalized, rollup will handle the logic
diff --git a/gwos/contracts/custodian-lock/src/main.rs b/gwos/contracts/custodian-lock/src/main.rs
index 71dabfea8..ff6bd2011 100644
--- a/gwos/contracts/custodian-lock/src/main.rs
+++ b/gwos/contracts/custodian-lock/src/main.rs
@@ -9,12 +9,13 @@
 #![feature(lang_items)]
 #![feature(alloc_error_handler)]
 #![feature(panic_info_message)]
-#![feature(asm)]
+#![feature(asm_sym)]
 
 // define modules
 mod entry;
 
 use ckb_std::default_alloc;
+use core::arch::asm;
 pub use gw_utils::{ckb_std, error};
 
 ckb_std::entry!(program_entry);
diff --git a/gwos/contracts/deposit-lock/src/main.rs b/gwos/contracts/deposit-lock/src/main.rs
index 71dabfea8..ff6bd2011 100644
--- a/gwos/contracts/deposit-lock/src/main.rs
+++ b/gwos/contracts/deposit-lock/src/main.rs
@@ -9,12 +9,13 @@
 #![feature(lang_items)]
 #![feature(alloc_error_handler)]
 #![feature(panic_info_message)]
-#![feature(asm)]
+#![feature(asm_sym)]
 
 // define modules
 mod entry;
 
 use ckb_std::default_alloc;
+use core::arch::asm;
 pub use gw_utils::{ckb_std, error};
 
 ckb_std::entry!(program_entry);
diff --git a/gwos/contracts/eth-account-lock/src/entry.rs b/gwos/contracts/eth-account-lock/src/entry.rs
index af530efdb..c30829f6b 100644
--- a/gwos/contracts/eth-account-lock/src/entry.rs
+++ b/gwos/contracts/eth-account-lock/src/entry.rs
@@ -14,8 +14,10 @@ use crate::{
     eth_signature::{extract_eth_lock_args, EthAddress, Secp256k1Eth},
 };
 use gw_utils::{
-    cells::utils::search_lock_hash, ckb_std::high_level::load_witness_args, error::Error,
-    gw_common::H256, gw_types::core::SigningType,
+    cells::utils::search_lock_hash,
+    ckb_std::high_level::load_witness_args,
+    error::Error,
+    gw_types::{core::SigningType, h256::H256},
 };
 
 /// Eth account lock
diff --git a/gwos/contracts/eth-account-lock/src/eth_signature.rs b/gwos/contracts/eth-account-lock/src/eth_signature.rs
index 1da98eb2a..a950e7a1e 100644
--- a/gwos/contracts/eth-account-lock/src/eth_signature.rs
+++ b/gwos/contracts/eth-account-lock/src/eth_signature.rs
@@ -1,6 +1,10 @@
 //! Secp256k1 Eth implementation
 
-use gw_utils::{ckb_std::debug, error::Error, gw_common::H256, gw_types::bytes::Bytes};
+use gw_utils::{
+    ckb_std::debug,
+    error::Error,
+    gw_types::{bytes::Bytes, h256::H256},
+};
 use secp256k1_utils::recover_uncompressed_key;
 use sha3::{Digest, Keccak256};
 
diff --git a/gwos/contracts/eth-account-lock/src/main.rs b/gwos/contracts/eth-account-lock/src/main.rs
index fd23000a7..ced7bf2d3 100644
--- a/gwos/contracts/eth-account-lock/src/main.rs
+++ b/gwos/contracts/eth-account-lock/src/main.rs
@@ -9,14 +9,14 @@
 #![feature(lang_items)]
 #![feature(alloc_error_handler)]
 #![feature(panic_info_message)]
-#![feature(asm)]
+#![feature(asm_sym)]
 
 // define modules
 mod entry;
 mod eth_signature;
 
 pub use gw_utils::ckb_std;
-
+use core::arch::asm;
 use ckb_std::default_alloc;
 
 ckb_std::entry!(program_entry);
diff --git a/gwos/contracts/gw-state/src/kv_state.rs b/gwos/contracts/gw-state/src/kv_state.rs
index 5986f5b59..992f83f1d 100644
--- a/gwos/contracts/gw-state/src/kv_state.rs
+++ b/gwos/contracts/gw-state/src/kv_state.rs
@@ -2,8 +2,8 @@ use crate::ckb_smt::smt::{Pair, Tree};
 use core::cell::RefCell;
 use gw_utils::ckb_std::debug;
 use gw_utils::error::Error;
-use gw_utils::gw_common::{error::Error as SMTError, state::State, H256};
-use gw_utils::gw_types::{packed::KVPairVecReader, prelude::*};
+use gw_utils::gw_common::{error::Error as SMTError, state::State, };
+use gw_utils::gw_types::{packed::KVPairVecReader, prelude::*, h256::H256};
 
 pub struct KVState<'a> {
     tree: RefCell<Tree<'a>>,
diff --git a/gwos/contracts/gw-utils/Cargo.toml b/gwos/contracts/gw-utils/Cargo.toml
index 6b22803e6..2795f370c 100644
--- a/gwos/contracts/gw-utils/Cargo.toml
+++ b/gwos/contracts/gw-utils/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ckb-std = "0.9.0"
-gw-types  = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "64f0576b527720226501fe8f0df305ce766aea0e", default-features = false }
-gw-common = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "64f0576b527720226501fe8f0df305ce766aea0e", default-features = false }
+ckb-std = "0.10.0"
+gw-types  = { path = "../../crates/types", default-features = false }
+gw-common  = { path = "../../crates/common", default-features = false }
diff --git a/gwos/contracts/gw-utils/src/cells/lock_cells.rs b/gwos/contracts/gw-utils/src/cells/lock_cells.rs
index 986a6e9f8..0ac60ef4b 100644
--- a/gwos/contracts/gw-utils/src/cells/lock_cells.rs
+++ b/gwos/contracts/gw-utils/src/cells/lock_cells.rs
@@ -15,10 +15,11 @@ use ckb_std::{
         load_cell_type_hash, QueryIter,
     },
 };
-use gw_common::{CKB_SUDT_SCRIPT_ARGS, H256};
+use gw_common::CKB_SUDT_SCRIPT_ARGS;
 use gw_types::{
     bytes::Bytes,
     core::ScriptHashType,
+    h256::{H256Ext, H256},
     packed::{Byte32, Byte32Reader, DepositLockArgs, RollupConfig, StakeLockArgs},
     prelude::*,
 };
diff --git a/gwos/contracts/gw-utils/src/cells/types.rs b/gwos/contracts/gw-utils/src/cells/types.rs
index bb63d4d3f..67dc528b1 100644
--- a/gwos/contracts/gw-utils/src/cells/types.rs
+++ b/gwos/contracts/gw-utils/src/cells/types.rs
@@ -1,10 +1,11 @@
 //! Cell types
 
-use crate::gw_common::{sparse_merkle_tree::H256, CKB_SUDT_SCRIPT_ARGS};
+use crate::gw_common::{CKB_SUDT_SCRIPT_ARGS};
 use crate::gw_types::packed::{
     ChallengeLockArgs, CustodianLockArgs, DepositLockArgs, Script, StakeLockArgs,
     WithdrawalLockArgs,
 };
+use crate::gw_types::h256::H256;
 
 #[derive(PartialEq, Eq, Debug, Clone)]
 pub struct CellValue {
@@ -15,7 +16,7 @@ pub struct CellValue {
 
 impl CellValue {
     pub fn is_ckb_only(&self) -> bool {
-        self.sudt_script_hash == CKB_SUDT_SCRIPT_ARGS.into() && self.amount == 0
+        self.sudt_script_hash == CKB_SUDT_SCRIPT_ARGS && self.amount == 0
     }
 }
 
diff --git a/gwos/contracts/gw-utils/src/cells/utils.rs b/gwos/contracts/gw-utils/src/cells/utils.rs
index 48d118f0a..93de4963a 100644
--- a/gwos/contracts/gw-utils/src/cells/utils.rs
+++ b/gwos/contracts/gw-utils/src/cells/utils.rs
@@ -3,10 +3,11 @@ use ckb_std::{
     ckb_constants::Source,
     high_level::{load_cell_lock_hash, QueryIter},
 };
-use gw_common::{CKB_SUDT_SCRIPT_ARGS, H256};
+use gw_common::{CKB_SUDT_SCRIPT_ARGS, };
 use gw_types::{
     bytes::Bytes,
     core::ScriptHashType,
+    h256::H256,
     packed::{RollupConfig, Script},
     prelude::*,
 };
@@ -33,7 +34,7 @@ pub fn build_l2_sudt_script(
     config: &RollupConfig,
     l1_sudt_script_hash: &H256,
 ) -> Option<Script> {
-    if l1_sudt_script_hash == &CKB_SUDT_SCRIPT_ARGS.into() {
+    if l1_sudt_script_hash == &CKB_SUDT_SCRIPT_ARGS {
         return None;
     }
     let args = {
diff --git a/gwos/contracts/gw-utils/src/error.rs b/gwos/contracts/gw-utils/src/error.rs
index c19b2ab46..2508cc1e9 100644
--- a/gwos/contracts/gw-utils/src/error.rs
+++ b/gwos/contracts/gw-utils/src/error.rs
@@ -1,7 +1,7 @@
 //! godwoken validator errors
 
 use ckb_std::error::SysError;
-use gw_common::{error::Error as CommonError, smt::Error as SMTError};
+use gw_common::error::Error as CommonError;
 
 /// Error
 #[repr(i8)]
@@ -82,9 +82,3 @@ impl From<CommonError> for Error {
         }
     }
 }
-
-impl From<SMTError> for Error {
-    fn from(_err: SMTError) -> Self {
-        Self::SMTKeyMissing
-    }
-}
diff --git a/gwos/contracts/gw-utils/src/finality.rs b/gwos/contracts/gw-utils/src/finality.rs
index 3ee895ed8..2ad627cf6 100644
--- a/gwos/contracts/gw-utils/src/finality.rs
+++ b/gwos/contracts/gw-utils/src/finality.rs
@@ -31,7 +31,7 @@ pub fn is_finalized(
 }
 
 fn is_timestamp_finalized(prev_global_state: &GlobalState, timestamp: u64) -> bool {
-    match Timepoint::from_full_value(prev_global_state.last_finalized_block_number().unpack()) {
+    match Timepoint::from_full_value(prev_global_state.last_finalized_timepoint().unpack()) {
         Timepoint::BlockNumber(_) => {
             debug!("[is_timestamp_finalized] switching version, prev_global_state.last_finalized_block_number is number-based");
             false
diff --git a/gwos/contracts/gw-utils/src/signature.rs b/gwos/contracts/gw-utils/src/signature.rs
index fc394bfbd..839d40791 100644
--- a/gwos/contracts/gw-utils/src/signature.rs
+++ b/gwos/contracts/gw-utils/src/signature.rs
@@ -2,8 +2,7 @@ use core::convert::TryFrom;
 
 use crate::{cells::utils::search_lock_hashes, error::Error};
 use ckb_std::{ckb_constants::Source, debug, syscalls::load_cell_data};
-use gw_common::H256;
-use gw_types::core::SigningType;
+use gw_types::{core::SigningType, h256::H256};
 
 /// Check l2 account signature cell
 pub fn check_l2_account_signature_cell(
diff --git a/gwos/contracts/stake-lock/src/entry.rs b/gwos/contracts/stake-lock/src/entry.rs
index 7ebe67c43..1c58927e9 100644
--- a/gwos/contracts/stake-lock/src/entry.rs
+++ b/gwos/contracts/stake-lock/src/entry.rs
@@ -54,13 +54,13 @@ pub fn main() -> Result<(), Error> {
     // Unlock by User
     // read global state from rollup cell in deps
     if let Some(global_state) = search_rollup_state(&rollup_type_hash, Source::CellDep)? {
-        // 1. check if stake_block_timepoint is finalized
+        // 1. check if stake_finalized_timepoint is finalized
         // 2. check if owner_lock_hash exists in input cells
         let config = load_rollup_config(&global_state.rollup_config_hash().unpack())?;
         let is_finalized = is_finalized(
             &config,
             &global_state,
-            &Timepoint::from_full_value(lock_args.stake_block_timepoint().unpack()),
+            &Timepoint::from_full_value(lock_args.stake_finalized_timepoint().unpack()),
         );
         if is_finalized
             && search_lock_hash(&lock_args.owner_lock_hash().unpack(), Source::Input).is_some()
diff --git a/gwos/contracts/stake-lock/src/main.rs b/gwos/contracts/stake-lock/src/main.rs
index 71dabfea8..ff6bd2011 100644
--- a/gwos/contracts/stake-lock/src/main.rs
+++ b/gwos/contracts/stake-lock/src/main.rs
@@ -9,12 +9,13 @@
 #![feature(lang_items)]
 #![feature(alloc_error_handler)]
 #![feature(panic_info_message)]
-#![feature(asm)]
+#![feature(asm_sym)]
 
 // define modules
 mod entry;
 
 use ckb_std::default_alloc;
+use core::arch::asm;
 pub use gw_utils::{ckb_std, error};
 
 ckb_std::entry!(program_entry);
diff --git a/gwos/contracts/state-validator/Cargo.toml b/gwos/contracts/state-validator/Cargo.toml
index a46622ae9..501032de9 100644
--- a/gwos/contracts/state-validator/Cargo.toml
+++ b/gwos/contracts/state-validator/Cargo.toml
@@ -8,3 +8,4 @@ edition = "2018"
 [dependencies]
 gw-utils = { path = "../gw-utils" }
 gw-state = { path = "../gw-state" }
+ckb-smt = { path = "../ckb-smt" }
diff --git a/gwos/contracts/state-validator/src/main.rs b/gwos/contracts/state-validator/src/main.rs
index 6457c2c20..328655c73 100644
--- a/gwos/contracts/state-validator/src/main.rs
+++ b/gwos/contracts/state-validator/src/main.rs
@@ -8,7 +8,7 @@
 #![feature(lang_items)]
 #![feature(alloc_error_handler)]
 #![feature(panic_info_message)]
-#![feature(asm)]
+#![feature(asm_sym)]
 
 // define modules
 mod entry;
@@ -16,13 +16,15 @@ mod types;
 mod verifications;
 
 use ckb_std::default_alloc;
+use core::arch::asm;
 pub use gw_utils::ckb_std;
 
-ckb_std::entry!(program_entry);
+ckb_std::entry!(main);
 default_alloc!();
 
 /// program entry
-fn program_entry() -> i8 {
+#[no_mangle]
+fn main() -> i8 {
     // Call main function and return error code
     match entry::main() {
         Ok(_) => 0,
diff --git a/gwos/contracts/state-validator/src/types.rs b/gwos/contracts/state-validator/src/types.rs
index 5c1d11b6e..c0b8df635 100644
--- a/gwos/contracts/state-validator/src/types.rs
+++ b/gwos/contracts/state-validator/src/types.rs
@@ -1,10 +1,8 @@
 //! state context
 //! supports read / write to global state
 
-use gw_common::sparse_merkle_tree::H256;
 use gw_utils::fork::Fork;
-use gw_utils::gw_common;
-use gw_utils::gw_types::core::Timepoint;
+use gw_utils::gw_types::core::{Timepoint, H256};
 
 #[derive(Clone)]
 pub struct DepositRequest {
@@ -36,14 +34,21 @@ pub struct BlockContext {
     pub block_hash: H256,
     pub rollup_type_hash: H256,
     pub prev_account_root: H256,
+
+    // global_state.version
     pub post_version: u8,
+
+    // finality_time_in_ms(rollup_config)
+    pub finality_time_in_ms: u64,
 }
 
 impl BlockContext {
-    pub const fn block_timepoint(&self) -> Timepoint {
+    pub const fn finalized_timepoint(&self) -> Timepoint {
         if Fork::use_timestamp_as_timepoint(self.post_version) {
-            Timepoint::from_timestamp(self.timestamp)
+            // the future finalized timestamp of block
+            Timepoint::from_timestamp(self.timestamp + self.finality_time_in_ms)
         } else {
+            // the current block number
             Timepoint::from_block_number(self.number)
         }
     }
diff --git a/gwos/contracts/state-validator/src/verifications/challenge.rs b/gwos/contracts/state-validator/src/verifications/challenge.rs
index d3aabd36e..44eeb6082 100644
--- a/gwos/contracts/state-validator/src/verifications/challenge.rs
+++ b/gwos/contracts/state-validator/src/verifications/challenge.rs
@@ -1,22 +1,19 @@
-use alloc::vec;
+use ckb_smt::smt::{Pair, Tree};
 use core::convert::TryInto;
-use gw_common::{smt::Blake2bHasher, sparse_merkle_tree::CompiledMerkleProof, H256};
-use gw_types::{
-    core::{ChallengeTargetType, Status, Timepoint},
-    packed::{GlobalState, RollupConfig},
-    prelude::*,
-};
-use gw_utils::finality::is_finalized;
+use gw_utils::finality::{finality_time_in_ms, is_finalized};
 use gw_utils::fork::Fork;
 use gw_utils::{
     cells::lock_cells::{collect_burn_cells, find_challenge_cell},
     ckb_std::{ckb_constants::Source, debug},
     error::Error,
 };
-use gw_utils::{cells::types::ChallengeCell, gw_types};
+use gw_utils::{cells::types::ChallengeCell};
 use gw_utils::{
-    gw_common,
-    gw_types::packed::{RawL2Block, RollupEnterChallengeReader},
+    gw_types::{
+        core::{ChallengeTargetType, Status, Timepoint, H256},
+        packed::{GlobalState, RawL2Block, RollupConfig, RollupEnterChallengeReader},
+        prelude::*,
+    },
 };
 
 use super::{check_rollup_lock_cells, check_status};
@@ -44,8 +41,12 @@ pub fn verify_enter_challenge(
     // check challenged block isn't finazlied
     let post_version: u8 = post_global_state.version().into();
     let block_timepoint = if Fork::use_timestamp_as_timepoint(post_version) {
-        Timepoint::from_timestamp(challenged_block.timestamp().unpack())
+        // new form, represents the future finalized timestamp
+        Timepoint::from_timestamp(
+            challenged_block.timestamp().unpack() + finality_time_in_ms(config),
+        )
     } else {
+        // legacy form, represents the current block number
         Timepoint::from_block_number(challenged_block.number().unpack())
     };
     let is_block_finalized = is_finalized(config, post_global_state, &block_timepoint);
@@ -54,19 +55,28 @@ pub fn verify_enter_challenge(
         return Err(Error::InvalidChallengeTarget);
     }
 
-    let valid = {
-        let merkle_proof = CompiledMerkleProof(witness.block_proof().unpack());
-        let leaves = vec![(
-            RawL2Block::compute_smt_key(challenged_block.number().unpack()).into(),
-            challenged_block.hash().into(),
-        )];
-        merkle_proof
-            .verify::<Blake2bHasher>(&prev_global_state.block().merkle_root().unpack(), leaves)?
-    };
-    if !valid {
-        debug!("enter challenge prev state merkle proof error");
-        return Err(Error::MerkleProof);
+    // merkle proof
+    {
+        let mut tree_buf = [Pair::default(); 1];
+        let mut smt_tree = Tree::new(&mut tree_buf);
+        let key = RawL2Block::compute_smt_key(challenged_block.number().unpack()).into();
+        let block_hash = challenged_block.hash().into();
+        smt_tree.update(&key, &block_hash).map_err(|err| {
+            debug!("[verify_enter_challenge] update smt tree error: {}", err);
+            Error::MerkleProof
+        })?;
+
+        let root = prev_global_state.block().merkle_root().unpack();
+        let proof = witness.block_proof().raw_data();
+        smt_tree.verify(&root, &proof).map_err(|err| {
+            debug!(
+                "[verify_enter_challenge] verify merkle proof error: {}",
+                err
+            );
+            Error::MerkleProof
+        })?;
     }
+
     let challenge_target = challenge_cell.args.target();
     let challenged_block_hash: [u8; 32] = challenge_target.block_hash().unpack();
     if challenged_block.hash() != challenged_block_hash {
diff --git a/gwos/contracts/state-validator/src/verifications/mod.rs b/gwos/contracts/state-validator/src/verifications/mod.rs
index 99c031cd4..0bd4aa81e 100644
--- a/gwos/contracts/state-validator/src/verifications/mod.rs
+++ b/gwos/contracts/state-validator/src/verifications/mod.rs
@@ -1,9 +1,8 @@
-use gw_common::H256;
 use gw_types::{
     core::Status,
+    h256::H256,
     packed::{GlobalState, RollupConfig},
 };
-use gw_utils::gw_common;
 use gw_utils::gw_types;
 use gw_utils::{
     cells::lock_cells::{
diff --git a/gwos/contracts/state-validator/src/verifications/revert.rs b/gwos/contracts/state-validator/src/verifications/revert.rs
index 3c45e7d4d..6856129ad 100644
--- a/gwos/contracts/state-validator/src/verifications/revert.rs
+++ b/gwos/contracts/state-validator/src/verifications/revert.rs
@@ -1,14 +1,10 @@
-use gw_common::{
-    h256_ext::H256Ext,
-    smt::{Blake2bHasher, CompiledMerkleProof},
-    H256,
-};
+use ckb_smt::smt::{Pair, Tree};
 use gw_types::{
     core::{Status, Timepoint},
+    h256::{H256, H256Ext},
     packed::{BlockMerkleState, Byte32, GlobalState, RawL2Block, RollupConfig},
     prelude::*,
 };
-use gw_utils::finality::finality_time_in_ms;
 use gw_utils::gw_types;
 use gw_utils::{
     cells::{
@@ -28,7 +24,6 @@ use gw_utils::{
 };
 use gw_utils::{
     fork::Fork,
-    gw_common,
     gw_types::packed::{RawL2BlockReader, RollupRevertReader},
 };
 
@@ -36,6 +31,8 @@ use super::{check_rollup_lock_cells_except_stake, check_status};
 use alloc::{collections::BTreeSet, vec::Vec};
 use gw_utils::error::Error;
 
+const MAX_REVERTED_BLOCKS: usize = 128;
+
 /// Check challenge cell is maturity(on the layer1)
 fn check_challenge_maturity(
     config: &RollupConfig,
@@ -162,9 +159,13 @@ fn check_reverted_blocks(
     if reverted_blocks.is_empty() {
         return Err(Error::InvalidRevertedBlocks);
     }
-    let reverted_block_hashes: Vec<H256> =
+    if reverted_blocks.len() > MAX_REVERTED_BLOCKS {
+        debug!("Exceeded maximum number of reverted blocks");
+        return Err(Error::InvalidRevertedBlocks);
+    }
+    let reverted_block_hashes: Vec<[u8; 32]> =
         reverted_blocks.iter().map(|b| b.hash().into()).collect();
-    let reverted_block_smt_keys: Vec<H256> = reverted_blocks
+    let reverted_block_smt_keys: Vec<[u8; 32]> = reverted_blocks
         .iter()
         .map(|b| RawL2Block::compute_smt_key(b.number().unpack()).into())
         .collect();
@@ -192,55 +193,97 @@ fn check_reverted_blocks(
             return Err(Error::InvalidRevertedBlocks);
         }
     }
+
     // prove the target block exists in the main chain
-    let block_merkle_proof = CompiledMerkleProof(revert_args.block_proof().unpack());
-    let is_main_chain_block = {
-        let leaves = reverted_block_smt_keys
-            .clone()
-            .into_iter()
+    let mut tree_buf = [Pair::default(); MAX_REVERTED_BLOCKS];
+    let block_merkle_proof = revert_args.block_proof().raw_data();
+    {
+        let mut smt_tree = Tree::new(&mut tree_buf);
+        for (key, block_hash) in reverted_block_smt_keys
+            .iter()
             .zip(reverted_block_hashes.clone())
-            .collect();
-        block_merkle_proof
-            .verify::<Blake2bHasher>(&prev_global_state.block().merkle_root().unpack(), leaves)?
-    };
-    if !is_main_chain_block {
-        return Err(Error::InvalidRevertedBlocks);
+        {
+            smt_tree.update(&key, &block_hash).map_err(|err| {
+                debug!("[check_reverted_blocks] update smt tree error: {}", err);
+                Error::MerkleProof
+            })?;
+        }
+
+        let root = prev_global_state.block().merkle_root().unpack();
+        smt_tree.verify(&root, &block_merkle_proof).map_err(|err| {
+            debug!(
+                "[check_reverted_blocks] expected target block exists in the main chain: {}",
+                err
+            );
+            Error::InvalidRevertedBlocks
+        })?;
     }
+
     // prove the target block isn't in the prev reverted block root
-    let reverted_block_merkle_proof =
-        CompiledMerkleProof(revert_args.reverted_block_proof().unpack());
-    let is_not_prev_reverted_block = {
-        let reverted_block_root: H256 = prev_global_state.reverted_block_root().unpack();
-        let leaves: Vec<_> = reverted_block_hashes
-            .clone()
-            .into_iter()
-            .map(|hash| (hash, H256::zero()))
-            .collect();
-        reverted_block_merkle_proof.verify::<Blake2bHasher>(&reverted_block_root, leaves)?
-    };
-    if !is_not_prev_reverted_block {
-        return Err(Error::InvalidRevertedBlocks);
+    let reverted_block_merkle_proof = revert_args.reverted_block_proof().raw_data();
+    {
+        tree_buf.fill_with(Default::default);
+        let mut smt_tree = Tree::new(&mut tree_buf);
+        let block_hash = H256::zero().into();
+        for key in &reverted_block_hashes {
+            smt_tree.update(key, &block_hash).map_err(|err| {
+                debug!("[check_reverted_blocks] update smt tree error: {}", err);
+                Error::MerkleProof
+            })?;
+        }
+
+        let reverted_block_root: [u8; 32] = prev_global_state.reverted_block_root().unpack();
+        smt_tree
+            .verify(&reverted_block_root, &reverted_block_merkle_proof)
+            .map_err(|err| {
+                debug!(
+                    "[check_reverted_blocks] expected target block isn't reverted: {}",
+                    err
+                );
+                Error::InvalidRevertedBlocks
+            })?
     }
     // prove the target block in the post reverted block root
-    let is_post_reverted_block = {
-        let leaves: Vec<_> = reverted_block_hashes
-            .into_iter()
-            .map(|hash| (hash, H256::one()))
-            .collect();
-        reverted_block_merkle_proof
-            .verify::<Blake2bHasher>(&post_global_state.reverted_block_root().unpack(), leaves)?
-    };
-    if !is_post_reverted_block {
-        return Err(Error::InvalidRevertedBlocks);
+    {
+        tree_buf.fill_with(Default::default);
+        let mut smt_tree = Tree::new(&mut tree_buf);
+        let block_hash = H256::one().into();
+        for key in &reverted_block_hashes {
+            smt_tree.update(key, &block_hash).map_err(|err| {
+                debug!("[check_reverted_blocks] update smt tree error: {}", err);
+                Error::MerkleProof
+            })?;
+        }
+
+        let root: [u8; 32] = post_global_state.reverted_block_root().unpack();
+        smt_tree
+            .verify(&root, &reverted_block_merkle_proof)
+            .map_err(|err| {
+                debug!("[check_reverted_blocks] expected target block is in the post reverted block root: {}", err);
+                Error::InvalidRevertedBlocks
+            })?
     }
     let reverted_block_root = post_global_state.reverted_block_root();
-    // calculate the prev block merkle state (delete reverted block hashes)
+    // calculate the new block merkle state (delete reverted block hashes from root)
     let block_merkle_state = {
-        let leaves = reverted_block_smt_keys
-            .into_iter()
-            .map(|smt_key| (smt_key, H256::zero()))
-            .collect();
-        let block_root = block_merkle_proof.compute_root::<Blake2bHasher>(leaves)?;
+        let block_root = {
+            tree_buf.fill_with(Default::default);
+            let mut smt_tree = Tree::new(&mut tree_buf);
+            let block_hash = H256::zero().into();
+            for key in &reverted_block_smt_keys {
+                smt_tree.update(key, &block_hash).map_err(|err| {
+                    debug!("[check_reverted_blocks] update smt tree error: {}", err);
+                    Error::MerkleProof
+                })?;
+            }
+
+            smt_tree
+                .calculate_root(&block_merkle_proof)
+                .map_err(|err| {
+                    debug!("[check_reverted_blocks] calculate new block root: {}", err);
+                    Error::InvalidRevertedBlocks
+                })?
+        };
         let block_count = reverted_blocks[0].number();
         BlockMerkleState::new_builder()
             .merkle_root(block_root.pack())
@@ -260,8 +303,7 @@ fn check_reverted_blocks(
             _ => return Err(Error::InvalidSince),
         };
         let l1_timestamp = rollup_input_timestamp;
-        let finalized_timestamp = l1_timestamp.saturating_sub(finality_time_in_ms(&config));
-        Timepoint::from_timestamp(finalized_timestamp)
+        Timepoint::from_timestamp(l1_timestamp)
     } else {
         let tip_number: u64 = reverted_blocks[0].number().unpack();
         let finalized_number = tip_number
@@ -286,7 +328,7 @@ fn check_reverted_blocks(
             .block(block_merkle_state)
             .tip_block_hash(tip_block_hash.to_entity())
             .tip_block_timestamp(tip_block_timestamp.to_entity())
-            .last_finalized_block_number(last_finalized.full_value().pack())
+            .last_finalized_timepoint(last_finalized.full_value().pack())
             .reverted_block_root(reverted_block_root)
             .status(status.into())
             .build()
diff --git a/gwos/contracts/state-validator/src/verifications/submit_block.rs b/gwos/contracts/state-validator/src/verifications/submit_block.rs
index 665e04c1e..8ae1abcfa 100644
--- a/gwos/contracts/state-validator/src/verifications/submit_block.rs
+++ b/gwos/contracts/state-validator/src/verifications/submit_block.rs
@@ -37,14 +37,14 @@ use gw_utils::{
 use gw_common::{
     builtins::CKB_SUDT_ACCOUNT_ID,
     error::Error as StateError,
-    h256_ext::H256Ext,
     merkle_utils::{calculate_ckb_merkle_root, calculate_state_checkpoint, ckb_merkle_leaf_hash},
     state::State,
-    CKB_SUDT_SCRIPT_ARGS, H256,
+    CKB_SUDT_SCRIPT_ARGS,
 };
 use gw_types::{
     bytes::Bytes,
     core::{ScriptHashType, Status, Timepoint},
+    h256::{H256Ext, H256},
     packed::{Byte32, GlobalState, RawL2Block, RollupConfig},
     prelude::*,
 };
@@ -80,12 +80,13 @@ fn check_withdrawal_cells<'a>(
             return Err(Error::InvalidWithdrawalCell);
         }
 
-        if cell.args.withdrawal_block_timepoint().unpack() != context.block_timepoint().full_value()
+        if cell.args.withdrawal_finalized_timepoint().unpack()
+            != context.finalized_timepoint().full_value()
         {
             debug!(
-                "withdrawal_cell.args.withdrawal_block_timepoint != context.block_timepoint, {} != {}",
-                cell.args.withdrawal_block_timepoint().unpack(),
-                context.block_timepoint().full_value()
+                "withdrawal_cell.args.withdrawal_finalized_timepoint != context.block_timepoint, {} != {}",
+                cell.args.withdrawal_finalized_timepoint().unpack(),
+                context.finalized_timepoint().full_value()
             );
             return Err(Error::InvalidWithdrawalCell);
         }
@@ -138,7 +139,7 @@ fn check_input_custodian_cells(
                 is_finalized(
                     config,
                     prev_global_state,
-                    &Timepoint::from_full_value(cell.args.deposit_block_timepoint().unpack()),
+                    &Timepoint::from_full_value(cell.args.deposit_finalized_timepoint().unpack()),
                 )
             });
     // check unfinalized custodian cells == reverted deposit requests
@@ -187,11 +188,11 @@ fn check_output_custodian_cells(
                 is_finalized(
                     config,
                     prev_global_state,
-                    &Timepoint::from_full_value(cell.args.deposit_block_timepoint().unpack()),
+                    &Timepoint::from_full_value(cell.args.deposit_finalized_timepoint().unpack()),
                 )
             });
     // check deposits request cells == unfinalized custodian cells
-    // check l2block's timepoint == unfinalized custodian cells' deposit_block_timepoint
+    // check l2block's timepoint == unfinalized custodian cells' deposit_finalized_timepoint
     // check l2block's block_hash == unfinalized custodian cells' deposit_block_hash
     for custodian_cell in unfinalized_custodian_cells {
         let index = deposit_cells
@@ -199,8 +200,8 @@ fn check_output_custodian_cells(
             .position(|cell| {
                 custodian_cell.args.deposit_lock_args() == cell.args
                     && custodian_cell.args.deposit_block_hash() == context.block_hash.pack()
-                    && custodian_cell.args.deposit_block_timepoint().unpack()
-                        == context.block_timepoint().full_value()
+                    && custodian_cell.args.deposit_finalized_timepoint().unpack()
+                        == context.finalized_timepoint().full_value()
                     && custodian_cell.value == cell.value
             })
             .ok_or(Error::InvalidCustodianCell)?;
@@ -427,7 +428,7 @@ fn load_block_context_and_state<'a>(
     }
 
     let timestamp: u64 = raw_block.timestamp().unpack();
-    check_block_timestamp(rollup_config, post_global_state, timestamp)?;
+    check_block_timestamp(post_global_state, timestamp)?;
 
     // verify parent block hash
     if raw_block.parent_block_hash().as_slice() != prev_global_state.tip_block_hash().as_slice() {
@@ -520,6 +521,7 @@ fn load_block_context_and_state<'a>(
         block_hash,
         prev_account_root,
         post_version,
+        finality_time_in_ms: finality_time_in_ms(&rollup_config),
     };
 
     debug!(
@@ -529,14 +531,16 @@ fn load_block_context_and_state<'a>(
             timestamp: {},
             block_hash: {:#x},
             post_version: {},
-            prev_account_root: {:#x}
+            prev_account_root: {:#x},
+            finality_time_in_ms: {}
         }}",
         context.rollup_type_hash.pack(),
         context.number,
         context.timestamp,
         context.block_hash.pack(),
         context.post_version,
-        context.prev_account_root.pack()
+        context.prev_account_root.pack(),
+        context.finality_time_in_ms
     );
 
     Ok((context, kv_state))
@@ -576,7 +580,7 @@ fn verify_block_producer(
         let expected_stake_lock_args = input_stake_cell
             .args
             .as_builder()
-            .stake_block_timepoint(context.block_timepoint().full_value().pack())
+            .stake_finalized_timepoint(context.finalized_timepoint().full_value().pack())
             .build();
         if expected_stake_lock_args != output_stake_cell.args
             || input_stake_cell.capacity > output_stake_cell.capacity
@@ -662,7 +666,7 @@ fn check_block_transactions(
         .enumerate()
         .map(|(idx, tx)| ckb_merkle_leaf_hash(idx as u32, &tx.witness_hash().into()))
         .collect();
-    let merkle_root: H256 = calculate_ckb_merkle_root(leaves)?;
+    let merkle_root: H256 = calculate_ckb_merkle_root(leaves);
     if tx_witness_root != merkle_root {
         debug!("failed to check block tx_witness_root");
         return Err(Error::MerkleProof);
@@ -737,7 +741,7 @@ fn check_block_withdrawals(block: &L2BlockReader) -> Result<(), Error> {
             ckb_merkle_leaf_hash(idx as u32, &withdrawal.witness_hash().into())
         })
         .collect();
-    let merkle_root = calculate_ckb_merkle_root(leaves)?;
+    let merkle_root = calculate_ckb_merkle_root(leaves);
     if withdrawal_witness_root != merkle_root {
         debug!("failed to check block withdrawal_witness_root");
         return Err(Error::MerkleProof);
@@ -750,14 +754,11 @@ fn check_block_withdrawals(block: &L2BlockReader) -> Result<(), Error> {
 // Assert l2block.timestamp <= l1tx.since
 // Assert l2block.timestamp <=
 //      post_global_state.last_finalized_timepoint
-//      + rollup_config.finality_time_in_ms()
 //      + 4h
 // Assert l2block.timestamp >=
 //      post_global_state.last_finalized_timepoint
-//      + rollup_config.finality_time_in_ms()
 //      - 4h
 fn check_block_timestamp(
-    rollup_config: &RollupConfig,
     post_global_state: &GlobalState,
     block_timestamp: u64,
 ) -> Result<(), Error> {
@@ -789,11 +790,10 @@ fn check_block_timestamp(
         // 4 hours, 4 * 60 * 60 * 1000 = 14400000ms
         const BACKBONE_BIAS: u64 = 14400000;
         let backbone = {
-            match Timepoint::from_full_value(
-                post_global_state.last_finalized_block_number().unpack(),
-            ) {
+            match Timepoint::from_full_value(post_global_state.last_finalized_timepoint().unpack())
+            {
                 Timepoint::BlockNumber(_) => unreachable!(),
-                Timepoint::Timestamp(ts) => ts + finality_time_in_ms(rollup_config),
+                Timepoint::Timestamp(current_timestamp) => current_timestamp,
             }
         };
         if !(backbone.saturating_sub(BACKBONE_BIAS) <= block_timestamp
@@ -838,19 +838,19 @@ fn check_global_state_last_finalized_timepoint(
     // skip
     // if context.post_version == 0 { }
 
-    if prev_global_state.last_finalized_block_number().unpack()
-        > post_global_state.last_finalized_block_number().unpack()
+    if prev_global_state.last_finalized_timepoint().unpack()
+        > post_global_state.last_finalized_timepoint().unpack()
     {
         debug!(
-            "check_global_state_last_finalized_timepoint prev last_finalized_block_number > post last_finalized_block_number, {} > {}",
-            prev_global_state.last_finalized_block_number().unpack(),
-            post_global_state.last_finalized_block_number().unpack()
+            "check_global_state_last_finalized_timepoint prev last_finalized_timepoint > post last_finalized_timepoint, {} > {}",
+            prev_global_state.last_finalized_timepoint().unpack(),
+            post_global_state.last_finalized_timepoint().unpack()
         );
         return Err(Error::InvalidPostGlobalState);
     }
 
     let last_finalized_timepoint =
-        Timepoint::from_full_value(post_global_state.last_finalized_block_number().unpack());
+        Timepoint::from_full_value(post_global_state.last_finalized_timepoint().unpack());
 
     match (
         Fork::use_timestamp_as_timepoint(context.post_version),
@@ -862,7 +862,7 @@ fn check_global_state_last_finalized_timepoint(
                 return Err(Error::InvalidPostGlobalState);
             }
         }
-        (true, Timepoint::Timestamp(last_finalized_timestamp)) => {
+        (true, Timepoint::Timestamp(current_timestamp)) => {
             let rollup_input_since = Since::new(load_input_since(0, Source::GroupInput)?);
             let rollup_input_timestamp = match (
                 rollup_input_since.is_absolute(),
@@ -871,9 +871,7 @@ fn check_global_state_last_finalized_timepoint(
                 (true, Some(LockValue::Timestamp(time_ms))) => time_ms,
                 _ => return Err(Error::InvalidSince),
             };
-            if !(last_finalized_timestamp + finality_time_in_ms(rollup_config)
-                < rollup_input_timestamp)
-            {
+            if !(current_timestamp < rollup_input_timestamp) {
                 return Err(Error::InvalidPostGlobalState);
             }
         }
@@ -970,7 +968,7 @@ pub fn verify(
 
         // check_global_state_tip_block_timestamp() has checked post_global_state.tip_block_timestamp
         // check_global_state_last_finalized_timepoint() has checked post_global_state.last_finalized_block_number
-        let last_finalized_block_number = post_global_state.last_finalized_block_number();
+        let last_finalized_timepoint = post_global_state.last_finalized_timepoint();
         let tip_block_timestamp = if context.post_version == 0 {
             0
         } else {
@@ -984,7 +982,7 @@ pub fn verify(
             .block(block_merkle_state)
             .tip_block_hash(context.block_hash.pack())
             .tip_block_timestamp(tip_block_timestamp.pack())
-            .last_finalized_block_number(last_finalized_block_number)
+            .last_finalized_timepoint(last_finalized_timepoint)
             .version(context.post_version.into())
             .build()
     };
diff --git a/gwos/contracts/tron-account-lock/Cargo.toml b/gwos/contracts/tron-account-lock/Cargo.toml
deleted file mode 100644
index 6ad3c9fc0..000000000
--- a/gwos/contracts/tron-account-lock/Cargo.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-[package]
-name = "tron-account-lock"
-version = "0.1.0"
-edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-gw-utils = { path = "../gw-utils" }
-secp256k1-utils = { path = "../secp256k1-utils" }
-sha3 = { version = "0.9", default-features = false }
diff --git a/gwos/contracts/tron-account-lock/src/entry.rs b/gwos/contracts/tron-account-lock/src/entry.rs
deleted file mode 100644
index d7129be94..000000000
--- a/gwos/contracts/tron-account-lock/src/entry.rs
+++ /dev/null
@@ -1,118 +0,0 @@
-// Import from `core` instead of from `std` since we are in no-std mode
-use core::{convert::TryFrom, result::Result};
-
-// Import CKB syscalls and structures
-// https://nervosnetwork.github.io/ckb-std/riscv64imac-unknown-none-elf/doc/ckb_std/index.html
-use crate::{
-    ckb_std::{
-        ckb_constants::Source,
-        ckb_types::{bytes::Bytes, prelude::Unpack as CKBUnpack},
-        debug,
-        high_level::load_script,
-        syscalls::load_cell_data,
-    },
-    tron_signature::{extract_lock_args, Secp256k1Tron, TronAddress},
-};
-use gw_utils::{
-    cells::utils::search_lock_hash, ckb_std::high_level::load_witness_args, error::Error,
-    gw_common::H256, gw_types::core::SigningType,
-};
-
-/// Eth account lock
-/// script args: rollup_script_hash(32 bytes) | tron_address(20 bytes)
-/// data: onetime_owner_lock_hash(32 bytes) | signing type (1 byte) | message(32 bytes)
-pub fn main() -> Result<(), Error> {
-    // parse args
-    let script = load_script()?;
-    let args: Bytes = CKBUnpack::unpack(&script.args());
-    let (_rollup_script_hash, tron_address) = extract_lock_args(args)?;
-    debug!("tron_address {:?}", &tron_address);
-
-    // parse data
-    let (onetime_owner_lock_hash, signing_type, message) = parse_data()?;
-
-    // check owner lock hash cell
-    // to prevent others unlock this cell
-    if search_lock_hash(&onetime_owner_lock_hash, Source::Input).is_none() {
-        return Err(Error::OwnerCellNotFound);
-    }
-
-    // verify signature
-    debug!("Verify message signature {:?}", &message);
-    verify_message_signature(tron_address, signing_type, message)?;
-
-    Ok(())
-}
-
-/// load signature from witness
-fn load_signature_from_witness() -> Result<[u8; 65], Error> {
-    const SIGNATURE_SIZE: usize = 65;
-
-    let witness_args = load_witness_args(0, Source::GroupInput)?;
-    let signature: Bytes = witness_args
-        .lock()
-        .to_opt()
-        .ok_or(Error::WrongSignature)?
-        .unpack();
-    if signature.len() != SIGNATURE_SIZE {
-        debug!(
-            "signature len: {}, expected len: {}",
-            signature.len(),
-            SIGNATURE_SIZE
-        );
-        return Err(Error::WrongSignature);
-    }
-
-    let mut buf = [0u8; 65];
-    buf.copy_from_slice(&signature);
-    Ok(buf)
-}
-
-fn verify_message_signature(
-    tron_address: TronAddress,
-    signing_type: SigningType,
-    message: H256,
-) -> Result<(), Error> {
-    // load signature
-    let signature = load_signature_from_witness()?;
-    // verify message
-    let secp256k1_tron = Secp256k1Tron::default();
-    let valid = match signing_type {
-        SigningType::WithPrefix => {
-            secp256k1_tron.verify_message(tron_address, signature, message)?
-        }
-        SigningType::Raw => secp256k1_tron.verify_alone(tron_address, signature, message)?,
-    };
-    if !valid {
-        debug!("Wrong signature, message: {:?}", message);
-        return Err(Error::WrongSignature);
-    }
-    Ok(())
-}
-
-/// parse cell's data
-/// return (onetime_owner_lock_hash, sign type, message)
-fn parse_data() -> Result<([u8; 32], SigningType, H256), Error> {
-    let mut data = [0u8; 65];
-    let loaded_size = load_cell_data(&mut data, 0, 0, Source::GroupInput)?;
-
-    if loaded_size != 65 {
-        debug!("Invalid data size: {}", loaded_size);
-        return Err(Error::Encoding);
-    }
-
-    // copy owner lock hash
-    let mut owner_lock_hash = [0u8; 32];
-    owner_lock_hash.copy_from_slice(&data[..32]);
-
-    // copy message
-    let signing_type = SigningType::try_from(data[32]).map_err(|err| {
-        debug!("Invalid signature message type {}", err);
-        Error::Encoding
-    })?;
-
-    let mut msg = [0u8; 32];
-    msg.copy_from_slice(&data[33..65]);
-
-    Ok((owner_lock_hash, signing_type, msg.into()))
-}
diff --git a/gwos/contracts/tron-account-lock/src/main.rs b/gwos/contracts/tron-account-lock/src/main.rs
deleted file mode 100644
index c6bf814f6..000000000
--- a/gwos/contracts/tron-account-lock/src/main.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-//! Generated by capsule
-//!
-//! `main.rs` is used to define rust lang items and modules.
-//! See `entry.rs` for the `main` function.
-//! See `error.rs` for the `Error` type.
-
-#![no_std]
-#![no_main]
-#![feature(lang_items)]
-#![feature(alloc_error_handler)]
-#![feature(panic_info_message)]
-#![feature(asm)]
-
-// define modules
-mod entry;
-mod tron_signature;
-
-pub use gw_utils::ckb_std;
-
-use ckb_std::default_alloc;
-
-ckb_std::entry!(program_entry);
-default_alloc!();
-
-/// program entry
-fn program_entry() -> i8 {
-    // Call main function and return error code
-    match entry::main() {
-        Ok(_) => 0,
-        Err(err) => err as i8,
-    }
-}
diff --git a/gwos/contracts/tron-account-lock/src/tron_signature.rs b/gwos/contracts/tron-account-lock/src/tron_signature.rs
deleted file mode 100644
index de72d2a54..000000000
--- a/gwos/contracts/tron-account-lock/src/tron_signature.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-//! Secp256k1 Eth implementation
-
-use gw_utils::{ckb_std::debug, error::Error, gw_common::H256, gw_types::bytes::Bytes};
-use secp256k1_utils::recover_uncompressed_key;
-use sha3::{Digest, Keccak256};
-
-pub type TronAddress = [u8; 20];
-
-pub fn extract_lock_args(lock_args: Bytes) -> Result<(H256, TronAddress), Error> {
-    if lock_args.len() != 52 {
-        debug!("Invalid lock args len: {}", lock_args.len());
-        return Err(Error::InvalidArgs);
-    }
-    let rollup_script_hash = {
-        let mut buf = [0u8; 32];
-        buf.copy_from_slice(&lock_args[..32]);
-        buf.into()
-    };
-    let address = {
-        let mut buf = [0u8; 20];
-        buf.copy_from_slice(&lock_args[32..]);
-        buf
-    };
-    Ok((rollup_script_hash, address))
-}
-
-#[derive(Default)]
-pub struct Secp256k1Tron;
-
-impl Secp256k1Tron {
-    pub fn verify_alone(
-        &self,
-        address: TronAddress,
-        mut signature: [u8; 65],
-        message: H256,
-    ) -> Result<bool, Error> {
-        // rewrite rec_id
-        signature[64] = match signature[64] {
-            28 => 1,
-            _ => 0,
-        };
-        let pubkey = recover_uncompressed_key(message.into(), signature).map_err(|err| {
-            debug!("failed to recover secp256k1 pubkey, error number: {}", err);
-            Error::WrongSignature
-        })?;
-        let pubkey_hash = {
-            let mut hasher = Keccak256::new();
-            hasher.update(&pubkey[1..]);
-            let buf = hasher.finalize();
-            let mut pubkey_hash = [0u8; 20];
-            pubkey_hash.copy_from_slice(&buf[12..]);
-            pubkey_hash
-        };
-        if pubkey_hash != address {
-            return Ok(false);
-        }
-        Ok(true)
-    }
-
-    pub fn verify_message(
-        &self,
-        address: TronAddress,
-        signature: [u8; 65],
-        message: H256,
-    ) -> Result<bool, Error> {
-        let mut hasher = Keccak256::new();
-        hasher.update("\x19TRON Signed Message:\n32");
-        hasher.update(message.as_slice());
-        let buf = hasher.finalize();
-        let mut signing_message = [0u8; 32];
-        signing_message.copy_from_slice(&buf[..]);
-        let signing_message = H256::from(signing_message);
-
-        self.verify_alone(address, signature, signing_message)
-    }
-}
diff --git a/gwos/contracts/withdrawal-lock/src/entry.rs b/gwos/contracts/withdrawal-lock/src/entry.rs
index 142f87b2a..98c2a2f7e 100644
--- a/gwos/contracts/withdrawal-lock/src/entry.rs
+++ b/gwos/contracts/withdrawal-lock/src/entry.rs
@@ -11,7 +11,8 @@ use gw_utils::cells::rollup::{
 };
 use gw_utils::ckb_std::{
     debug,
-    high_level::{load_cell_lock_hash, QueryIter},
+    high_level::{load_cell_lock_hash, load_input_since, QueryIter},
+    since::{LockValue, Since},
 };
 use gw_utils::finality::is_finalized;
 use gw_utils::gw_types::packed::{
@@ -136,8 +137,8 @@ pub fn main() -> Result<(), Error> {
             };
             let custodian_deposit_block_hash: [u8; 32] =
                 custodian_lock_args.deposit_block_hash().unpack();
-            let custodian_deposit_block_timepoint: u64 =
-                custodian_lock_args.deposit_block_timepoint().unpack();
+            let custodian_deposit_finalized_timepoint: u64 =
+                custodian_lock_args.deposit_finalized_timepoint().unpack();
             let global_state = search_rollup_state(&rollup_type_hash, Source::Input)?
                 .ok_or(Error::RollupCellNotFound)?;
             let config = load_rollup_config(&global_state.rollup_config_hash().unpack())?;
@@ -145,7 +146,7 @@ pub fn main() -> Result<(), Error> {
                 != config.custodian_script_type_hash().as_slice()
                 || custodian_lock.hash_type() != ScriptHashType::Type.into()
                 || custodian_deposit_block_hash != FINALIZED_BLOCK_HASH
-                || custodian_deposit_block_timepoint != FINALIZED_BLOCK_TIMEPOINT
+                || custodian_deposit_finalized_timepoint != FINALIZED_BLOCK_TIMEPOINT
             {
                 return Err(Error::InvalidOutput);
             }
@@ -155,25 +156,27 @@ pub fn main() -> Result<(), Error> {
             Ok(())
         }
         UnlockWithdrawalWitnessUnion::UnlockWithdrawalViaFinalize(_unlock_args) => {
-            // try search rollup state from deps
-            let global_state = match search_rollup_state(&rollup_type_hash, Source::CellDep)? {
-                Some(state) => state,
-                None => {
-                    // then try search rollup state from inputs
-                    search_rollup_state(&rollup_type_hash, Source::Input)?
-                        .ok_or(Error::RollupCellNotFound)?
+            let withdrawal_finalized_timepoint =
+                Timepoint::from_full_value(lock_args.withdrawal_finalized_timepoint().unpack());
+            match &withdrawal_finalized_timepoint {
+                Timepoint::BlockNumber(_) => {
+                    let global_state =
+                        match search_rollup_state(&rollup_type_hash, Source::CellDep)? {
+                            Some(state) => state,
+                            None => {
+                                // then try search rollup state from inputs
+                                search_rollup_state(&rollup_type_hash, Source::Input)?
+                                    .ok_or(Error::RollupCellNotFound)?
+                            }
+                        };
+                    let config = load_rollup_config(&global_state.rollup_config_hash().unpack())?;
+                    if !is_finalized(&config, &global_state, &withdrawal_finalized_timepoint) {
+                        return Err(Error::NotFinalized);
+                    }
+                }
+                Timepoint::Timestamp(finalized_timestamp) => {
+                    assert_timestamp_le_since(*finalized_timestamp)?
                 }
-            };
-            let config = load_rollup_config(&global_state.rollup_config_hash().unpack())?;
-
-            // check finality
-            let is_finalized = is_finalized(
-                &config,
-                &global_state,
-                &Timepoint::from_full_value(lock_args.withdrawal_block_timepoint().unpack()),
-            );
-            if !is_finalized {
-                return Err(Error::NotFinalized);
             }
 
             // withdrawal lock is finalized, unlock for owner
@@ -240,3 +243,24 @@ fn check_output_cell_has_same_content(
     }
     Ok(())
 }
+
+// NOTE: "Since" should only be used to prove that the input meets the time
+// condition. I designed it as an assertion function to prevent developers from
+// misusing it.
+fn assert_timestamp_le_since(timestamp: u64) -> Result<(), Error> {
+    let since = Since::new(load_input_since(0, Source::GroupInput)?);
+    let since_absolute_timestamp = match (since.is_absolute(), since.extract_lock_value()) {
+        (true, Some(LockValue::Timestamp(time_ms))) => time_ms,
+        _ => return Err(Error::InvalidSince),
+    };
+    let is_le = timestamp <= since_absolute_timestamp;
+    debug!(
+        "[assert_timestamp_le_since] is_le: {}, timestamp: {}, since_absolute_timestamp: {}",
+        is_le, timestamp, since_absolute_timestamp
+    );
+    if is_le {
+        Ok(())
+    } else {
+        Err(Error::NotFinalized)
+    }
+}
diff --git a/gwos/contracts/withdrawal-lock/src/main.rs b/gwos/contracts/withdrawal-lock/src/main.rs
index 71dabfea8..ff6bd2011 100644
--- a/gwos/contracts/withdrawal-lock/src/main.rs
+++ b/gwos/contracts/withdrawal-lock/src/main.rs
@@ -9,12 +9,13 @@
 #![feature(lang_items)]
 #![feature(alloc_error_handler)]
 #![feature(panic_info_message)]
-#![feature(asm)]
+#![feature(asm_sym)]
 
 // define modules
 mod entry;
 
 use ckb_std::default_alloc;
+use core::arch::asm;
 pub use gw_utils::{ckb_std, error};
 
 ckb_std::entry!(program_entry);
diff --git a/gwos/c-uint256-tests/Cargo.toml b/gwos/crates/c-uint256-tests/Cargo.toml
similarity index 94%
rename from gwos/c-uint256-tests/Cargo.toml
rename to gwos/crates/c-uint256-tests/Cargo.toml
index e86d76160..f64eaa28a 100644
--- a/gwos/c-uint256-tests/Cargo.toml
+++ b/gwos/crates/c-uint256-tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "c-uint256-tests"
-version = "0.1.0"
+version = "1.8.0-rc2"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/gwos/c-uint256-tests/build.rs b/gwos/crates/c-uint256-tests/build.rs
similarity index 84%
rename from gwos/c-uint256-tests/build.rs
rename to gwos/crates/c-uint256-tests/build.rs
index bd5faa328..ccbc1f155 100644
--- a/gwos/c-uint256-tests/build.rs
+++ b/gwos/crates/c-uint256-tests/build.rs
@@ -3,12 +3,12 @@ fn main() {
 
     // building
     build
-        .file("../c/rust-binding/uint256_wrapper.c")
+        .file("../../c/rust-binding/uint256_wrapper.c")
         .static_flag(true)
         .flag("-O3")
         .flag("-Wl,-static")
         .flag("-Wl,--gc-sections")
-        .include("../c/")
+        .include("../../c/")
         .flag("-Wall")
         .flag("-Werror")
         .flag("-Wno-unused-parameter")
diff --git a/gwos/c-uint256-tests/loop_proptest b/gwos/crates/c-uint256-tests/loop_proptest
similarity index 100%
rename from gwos/c-uint256-tests/loop_proptest
rename to gwos/crates/c-uint256-tests/loop_proptest
diff --git a/gwos/crates/c-uint256-tests/src/bindings.rs b/gwos/crates/c-uint256-tests/src/bindings.rs
new file mode 100644
index 000000000..608fcc3f8
--- /dev/null
+++ b/gwos/crates/c-uint256-tests/src/bindings.rs
@@ -0,0 +1,844 @@
+/* automatically generated by rust-bindgen 0.60.1 */
+
+pub const __WORDSIZE: u32 = 64;
+pub const __DARWIN_ONLY_64_BIT_INO_T: u32 = 1;
+pub const __DARWIN_ONLY_UNIX_CONFORMANCE: u32 = 1;
+pub const __DARWIN_ONLY_VERS_1050: u32 = 1;
+pub const __DARWIN_UNIX03: u32 = 1;
+pub const __DARWIN_64_BIT_INO_T: u32 = 1;
+pub const __DARWIN_VERS_1050: u32 = 1;
+pub const __DARWIN_NON_CANCELABLE: u32 = 0;
+pub const __DARWIN_SUF_EXTSN: &[u8; 14usize] = b"$DARWIN_EXTSN\0";
+pub const __DARWIN_C_ANSI: u32 = 4096;
+pub const __DARWIN_C_FULL: u32 = 900000;
+pub const __DARWIN_C_LEVEL: u32 = 900000;
+pub const __STDC_WANT_LIB_EXT1__: u32 = 1;
+pub const __DARWIN_NO_LONG_LONG: u32 = 0;
+pub const _DARWIN_FEATURE_64_BIT_INODE: u32 = 1;
+pub const _DARWIN_FEATURE_ONLY_64_BIT_INODE: u32 = 1;
+pub const _DARWIN_FEATURE_ONLY_VERS_1050: u32 = 1;
+pub const _DARWIN_FEATURE_ONLY_UNIX_CONFORMANCE: u32 = 1;
+pub const _DARWIN_FEATURE_UNIX_CONFORMANCE: u32 = 3;
+pub const __has_ptrcheck: u32 = 0;
+pub const __PTHREAD_SIZE__: u32 = 8176;
+pub const __PTHREAD_ATTR_SIZE__: u32 = 56;
+pub const __PTHREAD_MUTEXATTR_SIZE__: u32 = 8;
+pub const __PTHREAD_MUTEX_SIZE__: u32 = 56;
+pub const __PTHREAD_CONDATTR_SIZE__: u32 = 8;
+pub const __PTHREAD_COND_SIZE__: u32 = 40;
+pub const __PTHREAD_ONCE_SIZE__: u32 = 8;
+pub const __PTHREAD_RWLOCK_SIZE__: u32 = 192;
+pub const __PTHREAD_RWLOCKATTR_SIZE__: u32 = 16;
+pub const INT8_MAX: u32 = 127;
+pub const INT16_MAX: u32 = 32767;
+pub const INT32_MAX: u32 = 2147483647;
+pub const INT64_MAX: u64 = 9223372036854775807;
+pub const INT8_MIN: i32 = -128;
+pub const INT16_MIN: i32 = -32768;
+pub const INT32_MIN: i32 = -2147483648;
+pub const INT64_MIN: i64 = -9223372036854775808;
+pub const UINT8_MAX: u32 = 255;
+pub const UINT16_MAX: u32 = 65535;
+pub const UINT32_MAX: u32 = 4294967295;
+pub const UINT64_MAX: i32 = -1;
+pub const INT_LEAST8_MIN: i32 = -128;
+pub const INT_LEAST16_MIN: i32 = -32768;
+pub const INT_LEAST32_MIN: i32 = -2147483648;
+pub const INT_LEAST64_MIN: i64 = -9223372036854775808;
+pub const INT_LEAST8_MAX: u32 = 127;
+pub const INT_LEAST16_MAX: u32 = 32767;
+pub const INT_LEAST32_MAX: u32 = 2147483647;
+pub const INT_LEAST64_MAX: u64 = 9223372036854775807;
+pub const UINT_LEAST8_MAX: u32 = 255;
+pub const UINT_LEAST16_MAX: u32 = 65535;
+pub const UINT_LEAST32_MAX: u32 = 4294967295;
+pub const UINT_LEAST64_MAX: i32 = -1;
+pub const INT_FAST8_MIN: i32 = -128;
+pub const INT_FAST16_MIN: i32 = -32768;
+pub const INT_FAST32_MIN: i32 = -2147483648;
+pub const INT_FAST64_MIN: i64 = -9223372036854775808;
+pub const INT_FAST8_MAX: u32 = 127;
+pub const INT_FAST16_MAX: u32 = 32767;
+pub const INT_FAST32_MAX: u32 = 2147483647;
+pub const INT_FAST64_MAX: u64 = 9223372036854775807;
+pub const UINT_FAST8_MAX: u32 = 255;
+pub const UINT_FAST16_MAX: u32 = 65535;
+pub const UINT_FAST32_MAX: u32 = 4294967295;
+pub const UINT_FAST64_MAX: i32 = -1;
+pub const INTPTR_MAX: u64 = 9223372036854775807;
+pub const INTPTR_MIN: i64 = -9223372036854775808;
+pub const UINTPTR_MAX: i32 = -1;
+pub const SIZE_MAX: i32 = -1;
+pub const RSIZE_MAX: i32 = -1;
+pub const WINT_MIN: i32 = -2147483648;
+pub const WINT_MAX: u32 = 2147483647;
+pub const SIG_ATOMIC_MIN: i32 = -2147483648;
+pub const SIG_ATOMIC_MAX: u32 = 2147483647;
+pub type int_least8_t = i8;
+pub type int_least16_t = i16;
+pub type int_least32_t = i32;
+pub type int_least64_t = i64;
+pub type uint_least8_t = u8;
+pub type uint_least16_t = u16;
+pub type uint_least32_t = u32;
+pub type uint_least64_t = u64;
+pub type int_fast8_t = i8;
+pub type int_fast16_t = i16;
+pub type int_fast32_t = i32;
+pub type int_fast64_t = i64;
+pub type uint_fast8_t = u8;
+pub type uint_fast16_t = u16;
+pub type uint_fast32_t = u32;
+pub type uint_fast64_t = u64;
+pub type __int8_t = ::std::os::raw::c_schar;
+pub type __uint8_t = ::std::os::raw::c_uchar;
+pub type __int16_t = ::std::os::raw::c_short;
+pub type __uint16_t = ::std::os::raw::c_ushort;
+pub type __int32_t = ::std::os::raw::c_int;
+pub type __uint32_t = ::std::os::raw::c_uint;
+pub type __int64_t = ::std::os::raw::c_longlong;
+pub type __uint64_t = ::std::os::raw::c_ulonglong;
+pub type __darwin_intptr_t = ::std::os::raw::c_long;
+pub type __darwin_natural_t = ::std::os::raw::c_uint;
+pub type __darwin_ct_rune_t = ::std::os::raw::c_int;
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub union __mbstate_t {
+    pub __mbstate8: [::std::os::raw::c_char; 128usize],
+    pub _mbstateL: ::std::os::raw::c_longlong,
+}
+#[test]
+fn bindgen_test_layout___mbstate_t() {
+    assert_eq!(
+        ::std::mem::size_of::<__mbstate_t>(),
+        128usize,
+        concat!("Size of: ", stringify!(__mbstate_t))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<__mbstate_t>(),
+        8usize,
+        concat!("Alignment of ", stringify!(__mbstate_t))
+    );
+    fn test_field___mbstate8() {
+        assert_eq!(
+            unsafe {
+                let uninit = ::std::mem::MaybeUninit::<__mbstate_t>::uninit();
+                let ptr = uninit.as_ptr();
+                ::std::ptr::addr_of!((*ptr).__mbstate8) as usize - ptr as usize
+            },
+            0usize,
+            concat!(
+                "Offset of field: ",
+                stringify!(__mbstate_t),
+                "::",
+                stringify!(__mbstate8)
+            )
+        );
+    }
+    test_field___mbstate8();
+    fn test_field__mbstateL() {
+        assert_eq!(
+            unsafe {
+                let uninit = ::std::mem::MaybeUninit::<__mbstate_t>::uninit();
+                let ptr = uninit.as_ptr();
+                ::std::ptr::addr_of!((*ptr)._mbstateL) as usize - ptr as usize
+            },
+            0usize,
+            concat!(
+                "Offset of field: ",
+                stringify!(__mbstate_t),
+                "::",
+                stringify!(_mbstateL)
+            )
+        );
+    }
+    test_field__mbstateL();
+}
+pub type __darwin_mbstate_t = __mbstate_t;
+pub type __darwin_ptrdiff_t = ::std::os::raw::c_long;
+pub type __darwin_size_t = ::std::os::raw::c_ulong;
+pub type __darwin_va_list = __builtin_va_list;
+pub type __darwin_wchar_t = ::std::os::raw::c_int;
+pub type __darwin_rune_t = __darwin_wchar_t;
+pub type __darwin_wint_t = ::std::os::raw::c_int;
+pub type __darwin_clock_t = ::std::os::raw::c_ulong;
+pub type __darwin_socklen_t = __uint32_t;
+pub type __darwin_ssize_t = ::std::os::raw::c_long;
+pub type __darwin_time_t = ::std::os::raw::c_long;
+pub type __darwin_blkcnt_t = __int64_t;
+pub type __darwin_blksize_t = __int32_t;
+pub type __darwin_dev_t = __int32_t;
+pub type __darwin_fsblkcnt_t = ::std::os::raw::c_uint;
+pub type __darwin_fsfilcnt_t = ::std::os::raw::c_uint;
+pub type __darwin_gid_t = __uint32_t;
+pub type __darwin_id_t = __uint32_t;
+pub type __darwin_ino64_t = __uint64_t;
+pub type __darwin_ino_t = __darwin_ino64_t;
+pub type __darwin_mach_port_name_t = __darwin_natural_t;
+pub type __darwin_mach_port_t = __darwin_mach_port_name_t;
+pub type __darwin_mode_t = __uint16_t;
+pub type __darwin_off_t = __int64_t;
+pub type __darwin_pid_t = __int32_t;
+pub type __darwin_sigset_t = __uint32_t;
+pub type __darwin_suseconds_t = __int32_t;
+pub type __darwin_uid_t = __uint32_t;
+pub type __darwin_useconds_t = __uint32_t;
+pub type __darwin_uuid_t = [::std::os::raw::c_uchar; 16usize];
+pub type __darwin_uuid_string_t = [::std::os::raw::c_char; 37usize];
+#[repr(C)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub struct __darwin_pthread_handler_rec {
+    pub __routine: ::std::option::Option<unsafe extern "C" fn(arg1: *mut ::std::os::raw::c_void)>,
+    pub __arg: *mut ::std::os::raw::c_void,
+    pub __next: *mut __darwin_pthread_handler_rec,
+}
+#[test]
+fn bindgen_test_layout___darwin_pthread_handler_rec() {
+    assert_eq!(
+        ::std::mem::size_of::<__darwin_pthread_handler_rec>(),
+        24usize,
+        concat!("Size of: ", stringify!(__darwin_pthread_handler_rec))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<__darwin_pthread_handler_rec>(),
+        8usize,
+        concat!("Alignment of ", stringify!(__darwin_pthread_handler_rec))
+    );
+    fn test_field___routine() {
+        assert_eq!(
+            unsafe {
+                let uninit = ::std::mem::MaybeUninit::<__darwin_pthread_handler_rec>::uninit();
+                let ptr = uninit.as_ptr();
+                ::std::ptr::addr_of!((*ptr).__routine) as usize - ptr as usize
+            },
+            0usize,
+            concat!(
+                "Offset of field: ",
+                stringify!(__darwin_pthread_handler_rec),
+                "::",
+                stringify!(__routine)
+            )
+        );
+    }
+    test_field___routine();
+    fn test_field___arg() {
+        assert_eq!(
+            unsafe {
+                let uninit = ::std::mem::MaybeUninit::<__darwin_pthread_handler_rec>::uninit();
+                let ptr = uninit.as_ptr();
+                ::std::ptr::addr_of!((*ptr).__arg) as usize - ptr as usize
+            },
+            8usize,
+            concat!(
+                "Offset of field: ",
+                stringify!(__darwin_pthread_handler_rec),
+                "::",
+                stringify!(__arg)
+            )
+        );
+    }
+    test_field___arg();
+    fn test_field___next() {
+        assert_eq!(
+            unsafe {
+                let uninit = ::std::mem::MaybeUninit::<__darwin_pthread_handler_rec>::uninit();
+                let ptr = uninit.as_ptr();
+                ::std::ptr::addr_of!((*ptr).__next) as usize - ptr as usize
+            },
+            16usize,
+            concat!(
+                "Offset of field: ",
+                stringify!(__darwin_pthread_handler_rec),
+                "::",
+                stringify!(__next)
+            )
+        );
+    }
+    test_field___next();
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub struct _opaque_pthread_attr_t {
+    pub __sig: ::std::os::raw::c_long,
+    pub __opaque: [::std::os::raw::c_char; 56usize],
+}
+#[test]
+fn bindgen_test_layout__opaque_pthread_attr_t() {
+    assert_eq!(
+        ::std::mem::size_of::<_opaque_pthread_attr_t>(),
+        64usize,
+        concat!("Size of: ", stringify!(_opaque_pthread_attr_t))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<_opaque_pthread_attr_t>(),
+        8usize,
+        concat!("Alignment of ", stringify!(_opaque_pthread_attr_t))
+    );
+    fn test_field___sig() {
+        assert_eq!(
+            unsafe {
+                let uninit = ::std::mem::MaybeUninit::<_opaque_pthread_attr_t>::uninit();
+                let ptr = uninit.as_ptr();
+                ::std::ptr::addr_of!((*ptr).__sig) as usize - ptr as usize
+            },
+            0usize,
+            concat!(
+                "Offset of field: ",
+                stringify!(_opaque_pthread_attr_t),
+                "::",
+                stringify!(__sig)
+            )
+        );
+    }
+    test_field___sig();
+    fn test_field___opaque() {
+        assert_eq!(
+            unsafe {
+                let uninit = ::std::mem::MaybeUninit::<_opaque_pthread_attr_t>::uninit();
+                let ptr = uninit.as_ptr();
+                ::std::ptr::addr_of!((*ptr).__opaque) as usize - ptr as usize
+            },
+            8usize,
+            concat!(
+                "Offset of field: ",
+                stringify!(_opaque_pthread_attr_t),
+                "::",
+                stringify!(__opaque)
+            )
+        );
+    }
+    test_field___opaque();
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub struct _opaque_pthread_cond_t {
+    pub __sig: ::std::os::raw::c_long,
+    pub __opaque: [::std::os::raw::c_char; 40usize],
+}
+#[test]
+fn bindgen_test_layout__opaque_pthread_cond_t() {
+    assert_eq!(
+        ::std::mem::size_of::<_opaque_pthread_cond_t>(),
+        48usize,
+        concat!("Size of: ", stringify!(_opaque_pthread_cond_t))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<_opaque_pthread_cond_t>(),
+        8usize,
+        concat!("Alignment of ", stringify!(_opaque_pthread_cond_t))
+    );
+    fn test_field___sig() {
+        assert_eq!(
+            unsafe {
+                let uninit = ::std::mem::MaybeUninit::<_opaque_pthread_cond_t>::uninit();
+                let ptr = uninit.as_ptr();
+                ::std::ptr::addr_of!((*ptr).__sig) as usize - ptr as usize
+            },
+            0usize,
+            concat!(
+                "Offset of field: ",
+                stringify!(_opaque_pthread_cond_t),
+                "::",
+                stringify!(__sig)
+            )
+        );
+    }
+    test_field___sig();
+    fn test_field___opaque() {
+        assert_eq!(
+            unsafe {
+                let uninit = ::std::mem::MaybeUninit::<_opaque_pthread_cond_t>::uninit();
+                let ptr = uninit.as_ptr();
+                ::std::ptr::addr_of!((*ptr).__opaque) as usize - ptr as usize
+            },
+            8usize,
+            concat!(
+                "Offset of field: ",
+                stringify!(_opaque_pthread_cond_t),
+                "::",
+                stringify!(__opaque)
+            )
+        );
+    }
+    test_field___opaque();
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub struct _opaque_pthread_condattr_t {
+    pub __sig: ::std::os::raw::c_long,
+    pub __opaque: [::std::os::raw::c_char; 8usize],
+}
+#[test]
+fn bindgen_test_layout__opaque_pthread_condattr_t() {
+    assert_eq!(
+        ::std::mem::size_of::<_opaque_pthread_condattr_t>(),
+        16usize,
+        concat!("Size of: ", stringify!(_opaque_pthread_condattr_t))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<_opaque_pthread_condattr_t>(),
+        8usize,
+        concat!("Alignment of ", stringify!(_opaque_pthread_condattr_t))
+    );
+    fn test_field___sig() {
+        assert_eq!(
+            unsafe {
+                let uninit = ::std::mem::MaybeUninit::<_opaque_pthread_condattr_t>::uninit();
+                let ptr = uninit.as_ptr();
+                ::std::ptr::addr_of!((*ptr).__sig) as usize - ptr as usize
+            },
+            0usize,
+            concat!(
+                "Offset of field: ",
+                stringify!(_opaque_pthread_condattr_t),
+                "::",
+                stringify!(__sig)
+            )
+        );
+    }
+    test_field___sig();
+    fn test_field___opaque() {
+        assert_eq!(
+            unsafe {
+                let uninit = ::std::mem::MaybeUninit::<_opaque_pthread_condattr_t>::uninit();
+                let ptr = uninit.as_ptr();
+                ::std::ptr::addr_of!((*ptr).__opaque) as usize - ptr as usize
+            },
+            8usize,
+            concat!(
+                "Offset of field: ",
+                stringify!(_opaque_pthread_condattr_t),
+                "::",
+                stringify!(__opaque)
+            )
+        );
+    }
+    test_field___opaque();
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub struct _opaque_pthread_mutex_t {
+    pub __sig: ::std::os::raw::c_long,
+    pub __opaque: [::std::os::raw::c_char; 56usize],
+}
+#[test]
+fn bindgen_test_layout__opaque_pthread_mutex_t() {
+    assert_eq!(
+        ::std::mem::size_of::<_opaque_pthread_mutex_t>(),
+        64usize,
+        concat!("Size of: ", stringify!(_opaque_pthread_mutex_t))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<_opaque_pthread_mutex_t>(),
+        8usize,
+        concat!("Alignment of ", stringify!(_opaque_pthread_mutex_t))
+    );
+    fn test_field___sig() {
+        assert_eq!(
+            unsafe {
+                let uninit = ::std::mem::MaybeUninit::<_opaque_pthread_mutex_t>::uninit();
+                let ptr = uninit.as_ptr();
+                ::std::ptr::addr_of!((*ptr).__sig) as usize - ptr as usize
+            },
+            0usize,
+            concat!(
+                "Offset of field: ",
+                stringify!(_opaque_pthread_mutex_t),
+                "::",
+                stringify!(__sig)
+            )
+        );
+    }
+    test_field___sig();
+    fn test_field___opaque() {
+        assert_eq!(
+            unsafe {
+                let uninit = ::std::mem::MaybeUninit::<_opaque_pthread_mutex_t>::uninit();
+                let ptr = uninit.as_ptr();
+                ::std::ptr::addr_of!((*ptr).__opaque) as usize - ptr as usize
+            },
+            8usize,
+            concat!(
+                "Offset of field: ",
+                stringify!(_opaque_pthread_mutex_t),
+                "::",
+                stringify!(__opaque)
+            )
+        );
+    }
+    test_field___opaque();
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub struct _opaque_pthread_mutexattr_t {
+    pub __sig: ::std::os::raw::c_long,
+    pub __opaque: [::std::os::raw::c_char; 8usize],
+}
+#[test]
+fn bindgen_test_layout__opaque_pthread_mutexattr_t() {
+    assert_eq!(
+        ::std::mem::size_of::<_opaque_pthread_mutexattr_t>(),
+        16usize,
+        concat!("Size of: ", stringify!(_opaque_pthread_mutexattr_t))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<_opaque_pthread_mutexattr_t>(),
+        8usize,
+        concat!("Alignment of ", stringify!(_opaque_pthread_mutexattr_t))
+    );
+    fn test_field___sig() {
+        assert_eq!(
+            unsafe {
+                let uninit = ::std::mem::MaybeUninit::<_opaque_pthread_mutexattr_t>::uninit();
+                let ptr = uninit.as_ptr();
+                ::std::ptr::addr_of!((*ptr).__sig) as usize - ptr as usize
+            },
+            0usize,
+            concat!(
+                "Offset of field: ",
+                stringify!(_opaque_pthread_mutexattr_t),
+                "::",
+                stringify!(__sig)
+            )
+        );
+    }
+    test_field___sig();
+    fn test_field___opaque() {
+        assert_eq!(
+            unsafe {
+                let uninit = ::std::mem::MaybeUninit::<_opaque_pthread_mutexattr_t>::uninit();
+                let ptr = uninit.as_ptr();
+                ::std::ptr::addr_of!((*ptr).__opaque) as usize - ptr as usize
+            },
+            8usize,
+            concat!(
+                "Offset of field: ",
+                stringify!(_opaque_pthread_mutexattr_t),
+                "::",
+                stringify!(__opaque)
+            )
+        );
+    }
+    test_field___opaque();
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub struct _opaque_pthread_once_t {
+    pub __sig: ::std::os::raw::c_long,
+    pub __opaque: [::std::os::raw::c_char; 8usize],
+}
+#[test]
+fn bindgen_test_layout__opaque_pthread_once_t() {
+    assert_eq!(
+        ::std::mem::size_of::<_opaque_pthread_once_t>(),
+        16usize,
+        concat!("Size of: ", stringify!(_opaque_pthread_once_t))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<_opaque_pthread_once_t>(),
+        8usize,
+        concat!("Alignment of ", stringify!(_opaque_pthread_once_t))
+    );
+    fn test_field___sig() {
+        assert_eq!(
+            unsafe {
+                let uninit = ::std::mem::MaybeUninit::<_opaque_pthread_once_t>::uninit();
+                let ptr = uninit.as_ptr();
+                ::std::ptr::addr_of!((*ptr).__sig) as usize - ptr as usize
+            },
+            0usize,
+            concat!(
+                "Offset of field: ",
+                stringify!(_opaque_pthread_once_t),
+                "::",
+                stringify!(__sig)
+            )
+        );
+    }
+    test_field___sig();
+    fn test_field___opaque() {
+        assert_eq!(
+            unsafe {
+                let uninit = ::std::mem::MaybeUninit::<_opaque_pthread_once_t>::uninit();
+                let ptr = uninit.as_ptr();
+                ::std::ptr::addr_of!((*ptr).__opaque) as usize - ptr as usize
+            },
+            8usize,
+            concat!(
+                "Offset of field: ",
+                stringify!(_opaque_pthread_once_t),
+                "::",
+                stringify!(__opaque)
+            )
+        );
+    }
+    test_field___opaque();
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub struct _opaque_pthread_rwlock_t {
+    pub __sig: ::std::os::raw::c_long,
+    pub __opaque: [::std::os::raw::c_char; 192usize],
+}
+#[test]
+fn bindgen_test_layout__opaque_pthread_rwlock_t() {
+    assert_eq!(
+        ::std::mem::size_of::<_opaque_pthread_rwlock_t>(),
+        200usize,
+        concat!("Size of: ", stringify!(_opaque_pthread_rwlock_t))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<_opaque_pthread_rwlock_t>(),
+        8usize,
+        concat!("Alignment of ", stringify!(_opaque_pthread_rwlock_t))
+    );
+    fn test_field___sig() {
+        assert_eq!(
+            unsafe {
+                let uninit = ::std::mem::MaybeUninit::<_opaque_pthread_rwlock_t>::uninit();
+                let ptr = uninit.as_ptr();
+                ::std::ptr::addr_of!((*ptr).__sig) as usize - ptr as usize
+            },
+            0usize,
+            concat!(
+                "Offset of field: ",
+                stringify!(_opaque_pthread_rwlock_t),
+                "::",
+                stringify!(__sig)
+            )
+        );
+    }
+    test_field___sig();
+    fn test_field___opaque() {
+        assert_eq!(
+            unsafe {
+                let uninit = ::std::mem::MaybeUninit::<_opaque_pthread_rwlock_t>::uninit();
+                let ptr = uninit.as_ptr();
+                ::std::ptr::addr_of!((*ptr).__opaque) as usize - ptr as usize
+            },
+            8usize,
+            concat!(
+                "Offset of field: ",
+                stringify!(_opaque_pthread_rwlock_t),
+                "::",
+                stringify!(__opaque)
+            )
+        );
+    }
+    test_field___opaque();
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub struct _opaque_pthread_rwlockattr_t {
+    pub __sig: ::std::os::raw::c_long,
+    pub __opaque: [::std::os::raw::c_char; 16usize],
+}
+#[test]
+fn bindgen_test_layout__opaque_pthread_rwlockattr_t() {
+    assert_eq!(
+        ::std::mem::size_of::<_opaque_pthread_rwlockattr_t>(),
+        24usize,
+        concat!("Size of: ", stringify!(_opaque_pthread_rwlockattr_t))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<_opaque_pthread_rwlockattr_t>(),
+        8usize,
+        concat!("Alignment of ", stringify!(_opaque_pthread_rwlockattr_t))
+    );
+    fn test_field___sig() {
+        assert_eq!(
+            unsafe {
+                let uninit = ::std::mem::MaybeUninit::<_opaque_pthread_rwlockattr_t>::uninit();
+                let ptr = uninit.as_ptr();
+                ::std::ptr::addr_of!((*ptr).__sig) as usize - ptr as usize
+            },
+            0usize,
+            concat!(
+                "Offset of field: ",
+                stringify!(_opaque_pthread_rwlockattr_t),
+                "::",
+                stringify!(__sig)
+            )
+        );
+    }
+    test_field___sig();
+    fn test_field___opaque() {
+        assert_eq!(
+            unsafe {
+                let uninit = ::std::mem::MaybeUninit::<_opaque_pthread_rwlockattr_t>::uninit();
+                let ptr = uninit.as_ptr();
+                ::std::ptr::addr_of!((*ptr).__opaque) as usize - ptr as usize
+            },
+            8usize,
+            concat!(
+                "Offset of field: ",
+                stringify!(_opaque_pthread_rwlockattr_t),
+                "::",
+                stringify!(__opaque)
+            )
+        );
+    }
+    test_field___opaque();
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub struct _opaque_pthread_t {
+    pub __sig: ::std::os::raw::c_long,
+    pub __cleanup_stack: *mut __darwin_pthread_handler_rec,
+    pub __opaque: [::std::os::raw::c_char; 8176usize],
+}
+#[test]
+fn bindgen_test_layout__opaque_pthread_t() {
+    assert_eq!(
+        ::std::mem::size_of::<_opaque_pthread_t>(),
+        8192usize,
+        concat!("Size of: ", stringify!(_opaque_pthread_t))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<_opaque_pthread_t>(),
+        8usize,
+        concat!("Alignment of ", stringify!(_opaque_pthread_t))
+    );
+    fn test_field___sig() {
+        assert_eq!(
+            unsafe {
+                let uninit = ::std::mem::MaybeUninit::<_opaque_pthread_t>::uninit();
+                let ptr = uninit.as_ptr();
+                ::std::ptr::addr_of!((*ptr).__sig) as usize - ptr as usize
+            },
+            0usize,
+            concat!(
+                "Offset of field: ",
+                stringify!(_opaque_pthread_t),
+                "::",
+                stringify!(__sig)
+            )
+        );
+    }
+    test_field___sig();
+    fn test_field___cleanup_stack() {
+        assert_eq!(
+            unsafe {
+                let uninit = ::std::mem::MaybeUninit::<_opaque_pthread_t>::uninit();
+                let ptr = uninit.as_ptr();
+                ::std::ptr::addr_of!((*ptr).__cleanup_stack) as usize - ptr as usize
+            },
+            8usize,
+            concat!(
+                "Offset of field: ",
+                stringify!(_opaque_pthread_t),
+                "::",
+                stringify!(__cleanup_stack)
+            )
+        );
+    }
+    test_field___cleanup_stack();
+    fn test_field___opaque() {
+        assert_eq!(
+            unsafe {
+                let uninit = ::std::mem::MaybeUninit::<_opaque_pthread_t>::uninit();
+                let ptr = uninit.as_ptr();
+                ::std::ptr::addr_of!((*ptr).__opaque) as usize - ptr as usize
+            },
+            16usize,
+            concat!(
+                "Offset of field: ",
+                stringify!(_opaque_pthread_t),
+                "::",
+                stringify!(__opaque)
+            )
+        );
+    }
+    test_field___opaque();
+}
+pub type __darwin_pthread_attr_t = _opaque_pthread_attr_t;
+pub type __darwin_pthread_cond_t = _opaque_pthread_cond_t;
+pub type __darwin_pthread_condattr_t = _opaque_pthread_condattr_t;
+pub type __darwin_pthread_key_t = ::std::os::raw::c_ulong;
+pub type __darwin_pthread_mutex_t = _opaque_pthread_mutex_t;
+pub type __darwin_pthread_mutexattr_t = _opaque_pthread_mutexattr_t;
+pub type __darwin_pthread_once_t = _opaque_pthread_once_t;
+pub type __darwin_pthread_rwlock_t = _opaque_pthread_rwlock_t;
+pub type __darwin_pthread_rwlockattr_t = _opaque_pthread_rwlockattr_t;
+pub type __darwin_pthread_t = *mut _opaque_pthread_t;
+pub type u_int8_t = ::std::os::raw::c_uchar;
+pub type u_int16_t = ::std::os::raw::c_ushort;
+pub type u_int32_t = ::std::os::raw::c_uint;
+pub type u_int64_t = ::std::os::raw::c_ulonglong;
+pub type register_t = i64;
+pub type user_addr_t = u_int64_t;
+pub type user_size_t = u_int64_t;
+pub type user_ssize_t = i64;
+pub type user_long_t = i64;
+pub type user_ulong_t = u_int64_t;
+pub type user_time_t = i64;
+pub type user_off_t = i64;
+pub type syscall_arg_t = u_int64_t;
+pub type intmax_t = ::std::os::raw::c_long;
+pub type uintmax_t = ::std::os::raw::c_ulong;
+#[repr(C)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub struct uint256_t {
+    pub array: [u32; 8usize],
+}
+#[test]
+fn bindgen_test_layout_uint256_t() {
+    assert_eq!(
+        ::std::mem::size_of::<uint256_t>(),
+        32usize,
+        concat!("Size of: ", stringify!(uint256_t))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<uint256_t>(),
+        4usize,
+        concat!("Alignment of ", stringify!(uint256_t))
+    );
+    fn test_field_array() {
+        assert_eq!(
+            unsafe {
+                let uninit = ::std::mem::MaybeUninit::<uint256_t>::uninit();
+                let ptr = uninit.as_ptr();
+                ::std::ptr::addr_of!((*ptr).array) as usize - ptr as usize
+            },
+            0usize,
+            concat!(
+                "Offset of field: ",
+                stringify!(uint256_t),
+                "::",
+                stringify!(array)
+            )
+        );
+    }
+    test_field_array();
+}
+extern "C" {
+    pub fn gw_uint256_zero(num: *mut uint256_t);
+}
+extern "C" {
+    pub fn gw_uint256_one(num: *mut uint256_t);
+}
+extern "C" {
+    pub fn gw_uint256_max(num: *mut uint256_t);
+}
+extern "C" {
+    pub fn gw_uint256_overflow_add(
+        a: uint256_t,
+        b: uint256_t,
+        sum: *mut uint256_t,
+    ) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn gw_uint256_underflow_sub(
+        a: uint256_t,
+        b: uint256_t,
+        rem: *mut uint256_t,
+    ) -> ::std::os::raw::c_int;
+}
+pub const GW_UINT256_SMALLER: _bindgen_ty_1 = -1;
+pub const GW_UINT256_EQUAL: _bindgen_ty_1 = 0;
+pub const GW_UINT256_LARGER: _bindgen_ty_1 = 1;
+pub type _bindgen_ty_1 = ::std::os::raw::c_int;
+extern "C" {
+    pub fn gw_uint256_cmp(a: uint256_t, b: uint256_t) -> ::std::os::raw::c_int;
+}
+pub type __builtin_va_list = *mut ::std::os::raw::c_char;
diff --git a/gwos/c-uint256-tests/src/lib.rs b/gwos/crates/c-uint256-tests/src/lib.rs
similarity index 97%
rename from gwos/c-uint256-tests/src/lib.rs
rename to gwos/crates/c-uint256-tests/src/lib.rs
index 3b25765bc..795552998 100644
--- a/gwos/c-uint256-tests/src/lib.rs
+++ b/gwos/crates/c-uint256-tests/src/lib.rs
@@ -7,6 +7,7 @@ use self::bindings::{
 
 // deref_nullptr in test code `fn bindgen_test_layout_uint256_t()`.
 #[allow(dead_code)]
+#[allow(non_snake_case)]
 #[allow(non_camel_case_types)]
 #[allow(non_upper_case_globals)]
 #[allow(deref_nullptr)]
@@ -18,11 +19,11 @@ pub struct U256(uint256_t);
 impl U256 {
     pub fn from_le_bytes(bytes: [u8; 32]) -> Self {
         let mut array = [0u32; 8];
-        for i in 0..8 {
+        for (i, v) in array.iter_mut().enumerate() {
             let start = i * 4;
             let end = i * 4 + 4;
             let u32_val = u32::from_le_bytes(bytes[start..end].try_into().unwrap());
-            array[i] = u32_val;
+            *v = u32_val;
         }
         U256(uint256_t { array })
     }
diff --git a/crates/common/Cargo.toml b/gwos/crates/common/Cargo.toml
similarity index 64%
rename from crates/common/Cargo.toml
rename to gwos/crates/common/Cargo.toml
index 8edd6da04..e655e95e7 100644
--- a/crates/common/Cargo.toml
+++ b/gwos/crates/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-common"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 
@@ -8,13 +8,11 @@ edition = "2018"
 
 [dependencies]
 cfg-if = "0.1"
-sparse-merkle-tree = { version = "0.6.1", default-features = false }
 merkle-cbt = { version = "0.3.0", default-features = false }
-gw-hash = { path = "../hash" }
 thiserror = { version = "1.0", optional = true }
+gw-hash = { path = "../hash", default-features = false }
 gw-types = { path = "../types", default-features = false }
 
 [features]
 default = ["std"]
-std = ["sparse-merkle-tree/std", "thiserror", "gw-types/std"]
-smt-trie = ["sparse-merkle-tree/trie"]
+std = ["thiserror", "gw-types/std"]
diff --git a/crates/common/src/builtins.rs b/gwos/crates/common/src/builtins.rs
similarity index 100%
rename from crates/common/src/builtins.rs
rename to gwos/crates/common/src/builtins.rs
diff --git a/crates/common/src/ckb_decimal.rs b/gwos/crates/common/src/ckb_decimal.rs
similarity index 100%
rename from crates/common/src/ckb_decimal.rs
rename to gwos/crates/common/src/ckb_decimal.rs
diff --git a/crates/common/src/error.rs b/gwos/crates/common/src/error.rs
similarity index 85%
rename from crates/common/src/error.rs
rename to gwos/crates/common/src/error.rs
index 715e09042..2ad5b235f 100644
--- a/crates/common/src/error.rs
+++ b/gwos/crates/common/src/error.rs
@@ -1,12 +1,10 @@
-use crate::smt::Error as SMTError;
-
 cfg_if::cfg_if! {
     if #[cfg(feature = "std")] {
         use thiserror::Error;
         #[derive(Error, Debug, Eq, PartialEq, Clone)]
         pub enum Error {
             #[error("{_0}")]
-            SMT(SMTError),
+            SMT(String),
             #[error("Amount overflow")]
             AmountOverflow,
             #[error("Merkle proof error")]
@@ -27,7 +25,7 @@ cfg_if::cfg_if! {
     } else {
         #[derive(Debug, Eq, PartialEq, Clone)]
         pub enum Error {
-            SMT(SMTError),
+            SMT(alloc::string::String),
             AmountOverflow,
             MerkleProof,
             MissingKey,
@@ -39,9 +37,3 @@ cfg_if::cfg_if! {
         }
     }
 }
-
-impl From<SMTError> for Error {
-    fn from(err: SMTError) -> Self {
-        Error::SMT(err)
-    }
-}
diff --git a/crates/common/src/lib.rs b/gwos/crates/common/src/lib.rs
similarity index 72%
rename from crates/common/src/lib.rs
rename to gwos/crates/common/src/lib.rs
index 08648a5a2..97948a475 100644
--- a/crates/common/src/lib.rs
+++ b/gwos/crates/common/src/lib.rs
@@ -3,23 +3,15 @@
 pub mod builtins;
 pub mod ckb_decimal;
 pub mod error;
-pub mod h256_ext;
 pub mod merkle_utils;
 pub mod registry;
-pub mod smt;
 pub mod state;
 #[cfg(test)]
 pub mod test_traits;
-
-pub mod registry_address {
-    pub use gw_types::registry_address::RegistryAddress;
-}
+pub use gw_types::registry_address;
 
 // re-exports
-
 pub use gw_hash::blake2b;
-pub use h256_ext::H256;
-pub use sparse_merkle_tree;
 
 /// constants
 pub const CKB_SUDT_SCRIPT_ARGS: [u8; 32] = [0; 32];
diff --git a/crates/common/src/merkle_utils.rs b/gwos/crates/common/src/merkle_utils.rs
similarity index 68%
rename from crates/common/src/merkle_utils.rs
rename to gwos/crates/common/src/merkle_utils.rs
index 817ce06b8..e9bf7ed52 100644
--- a/crates/common/src/merkle_utils.rs
+++ b/gwos/crates/common/src/merkle_utils.rs
@@ -1,11 +1,8 @@
 use merkle_cbt::{merkle_tree::Merge, MerkleProof as ExMerkleProof, CBMT as ExCBMT};
 
+use crate::blake2b::new_blake2b;
 use crate::vec::Vec;
-use crate::{
-    blake2b::new_blake2b,
-    h256_ext::H256Ext,
-    smt::{default_store::DefaultStore, Error, H256, SMT},
-};
+use gw_types::h256::H256;
 
 // Calculate compacted account root
 pub fn calculate_state_checkpoint(root: &H256, count: u32) -> H256 {
@@ -14,19 +11,7 @@ pub fn calculate_state_checkpoint(root: &H256, count: u32) -> H256 {
     hasher.update(root.as_slice());
     hasher.update(&count.to_le_bytes());
     hasher.finalize(&mut hash);
-    hash.into()
-}
-
-/// Compute merkle root from vectors
-pub fn calculate_merkle_root(leaves: Vec<H256>) -> Result<H256, Error> {
-    if leaves.is_empty() {
-        return Ok(H256::zero());
-    }
-    let mut tree = SMT::<DefaultStore<H256>>::default();
-    for (i, leaf) in leaves.into_iter().enumerate() {
-        tree.update(H256::from_u32(i as u32), leaf)?;
-    }
-    Ok(*tree.root())
+    hash
 }
 
 pub struct MergeH256;
@@ -40,16 +25,16 @@ impl Merge for MergeH256 {
         blake2b.update(left.as_slice());
         blake2b.update(right.as_slice());
         blake2b.finalize(&mut hash);
-        hash.into()
+        hash
     }
 }
 
 pub type CBMT = ExCBMT<H256, MergeH256>;
 pub type CBMTMerkleProof = ExMerkleProof<H256, MergeH256>;
 
-pub fn calculate_ckb_merkle_root(leaves: Vec<H256>) -> Result<H256, Error> {
+pub fn calculate_ckb_merkle_root(leaves: Vec<H256>) -> H256 {
     let tree = CBMT::build_merkle_tree(&leaves);
-    Ok(tree.root())
+    tree.root()
 }
 
 /// blake2b(index(u32) | item_hash)
@@ -59,20 +44,16 @@ pub fn ckb_merkle_leaf_hash(index: u32, item_hash: &H256) -> H256 {
     hasher.update(item_hash.as_slice());
     let mut buf = [0u8; 32];
     hasher.finalize(&mut buf);
-    buf.into()
+    buf
 }
 
+#[cfg(test)]
 mod tests {
+    use gw_types::h256::H256;
 
     #[test]
     fn merkle_proof_test() {
-        let leaves: Vec<crate::smt::H256> = vec![
-            [0u8; 32].into(),
-            [1u8; 32].into(),
-            [2u8; 32].into(),
-            [3u8; 32].into(),
-            [4u8; 32].into(),
-        ];
+        let leaves: Vec<H256> = vec![[0u8; 32], [1u8; 32], [2u8; 32], [3u8; 32], [4u8; 32]];
         let leaves = leaves
             .into_iter()
             .enumerate()
@@ -92,7 +73,7 @@ mod tests {
             proof.lemmas().to_vec(),
         );
 
-        let proof_leaves: Vec<crate::smt::H256> = vec![[0u8; 32].into(), [4u8; 32].into()];
+        let proof_leaves: Vec<H256> = vec![[0u8; 32], [4u8; 32]];
         let proof_leaves = indices
             .into_iter()
             .zip(proof_leaves)
@@ -101,7 +82,7 @@ mod tests {
 
         assert!(proof.verify(&root, &proof_leaves));
 
-        let proof_leaves = vec![[1u8; 32].into(), [3u8; 32].into()];
+        let proof_leaves = vec![[1u8; 32], [3u8; 32]];
         assert!(!proof.verify(&root, &proof_leaves));
     }
 }
diff --git a/crates/common/src/registry/context.rs b/gwos/crates/common/src/registry/context.rs
similarity index 100%
rename from crates/common/src/registry/context.rs
rename to gwos/crates/common/src/registry/context.rs
diff --git a/crates/common/src/registry/eth_registry.rs b/gwos/crates/common/src/registry/eth_registry.rs
similarity index 100%
rename from crates/common/src/registry/eth_registry.rs
rename to gwos/crates/common/src/registry/eth_registry.rs
diff --git a/crates/common/src/registry/mod.rs b/gwos/crates/common/src/registry/mod.rs
similarity index 100%
rename from crates/common/src/registry/mod.rs
rename to gwos/crates/common/src/registry/mod.rs
diff --git a/crates/common/src/state.rs b/gwos/crates/common/src/state.rs
similarity index 96%
rename from crates/common/src/state.rs
rename to gwos/crates/common/src/state.rs
index 82ce0b0b7..040ef64f7 100644
--- a/crates/common/src/state.rs
+++ b/gwos/crates/common/src/state.rs
@@ -16,11 +16,13 @@
 //
 // Thus, the first 5 bytes keeps uniqueness for different type of keys.
 
-use gw_types::U256;
+use gw_types::{
+    h256::{H256Ext, H256},
+    U256,
+};
 
 use crate::builtins::ETH_REGISTRY_ACCOUNT_ID;
 use crate::error::Error;
-use crate::h256_ext::{H256Ext, H256};
 use crate::registry_address::RegistryAddress;
 use crate::vec::Vec;
 use crate::{blake2b::new_blake2b, merkle_utils::calculate_state_checkpoint};
@@ -56,7 +58,7 @@ pub fn build_account_key(id: u32, key: &[u8]) -> H256 {
     hasher.update(&[GW_ACCOUNT_KV_TYPE]);
     hasher.update(key);
     hasher.finalize(&mut raw_key);
-    raw_key.into()
+    raw_key
 }
 
 pub fn build_sudt_key(key_flag: u32, address: &RegistryAddress) -> Vec<u8> {
@@ -89,10 +91,10 @@ pub fn build_registry_address_to_script_hash_key(address: &RegistryAddress) -> V
 }
 
 pub fn build_account_field_key(id: u32, type_: u8) -> H256 {
-    let mut key: [u8; 32] = H256::zero().into();
+    let mut key: [u8; 32] = H256::zero();
     key[..size_of::<u32>()].copy_from_slice(&id.to_le_bytes());
     key[size_of::<u32>()] = type_;
-    key.into()
+    key
 }
 
 /// build_script_hash_to_account_id_key
@@ -100,23 +102,23 @@ pub fn build_account_field_key(id: u32, type_: u8) -> H256 {
 /// id(4 bytes) | exists flag(1 byte) | zeros bytes
 /// if script_hash is exists the exists flag turn into 1, otherwise it is 0.
 pub fn build_script_hash_to_account_id_key(script_hash: &[u8]) -> H256 {
-    let mut key: [u8; 32] = H256::zero().into();
+    let mut key: [u8; 32] = H256::zero();
     let mut hasher = new_blake2b();
     hasher.update(&GW_NON_ACCOUNT_PLACEHOLDER);
     hasher.update(&[GW_SCRIPT_HASH_TO_ID_TYPE]);
     hasher.update(script_hash);
     hasher.finalize(&mut key);
-    key.into()
+    key
 }
 
 pub fn build_data_hash_key(data_hash: &[u8]) -> H256 {
-    let mut key: [u8; 32] = H256::zero().into();
+    let mut key: [u8; 32] = H256::zero();
     let mut hasher = new_blake2b();
     hasher.update(&GW_NON_ACCOUNT_PLACEHOLDER);
     hasher.update(&[GW_DATA_HASH_TYPE]);
     hasher.update(data_hash);
     hasher.finalize(&mut key);
-    key.into()
+    key
 }
 
 pub struct PrepareWithdrawalRecord {
@@ -161,10 +163,10 @@ pub trait State {
         )?;
         // script hash to id
         let script_hash_to_id_value: H256 = {
-            let mut buf: [u8; 32] = H256::from_u32(id).into();
+            let mut buf: [u8; 32] = H256::from_u32(id);
             // the first 4 bytes is id, set exists flag(fifth byte) to 1
             buf[4] = 1;
-            buf.into()
+            buf
         };
         self.update_raw(
             build_script_hash_to_account_id_key(script_hash.as_slice()),
@@ -340,7 +342,7 @@ pub trait State {
             let mut addr_buf = [0u8; 32];
             addr.write_to_slice(&mut addr_buf)
                 .expect("write addr to buf");
-            self.update_value(addr.registry_id, &key, addr_buf.into())?;
+            self.update_value(addr.registry_id, &key, addr_buf)?;
         }
         // registry address -> script hash
         {
diff --git a/crates/common/src/test_traits.rs b/gwos/crates/common/src/test_traits.rs
similarity index 88%
rename from crates/common/src/test_traits.rs
rename to gwos/crates/common/src/test_traits.rs
index a490c876d..9b5e30c00 100644
--- a/crates/common/src/test_traits.rs
+++ b/gwos/crates/common/src/test_traits.rs
@@ -7,7 +7,7 @@ use crate::{
         build_registry_address_to_script_hash_key, build_script_hash_to_registry_address_key, State,
     },
 };
-use sparse_merkle_tree::H256;
+use gw_types::h256::H256;
 
 pub trait StateTest: State {
     fn mapping_address(
@@ -18,7 +18,7 @@ pub trait StateTest: State {
         // script_hash -> address
         let key = build_script_hash_to_registry_address_key(&script_hash);
         let value: [u8; 32] = address.to_bytes().try_into().expect("buffer overflow");
-        self.update_value(address.registry_id, &key, value.into())?;
+        self.update_value(address.registry_id, &key, value)?;
         // address -> script
         let key = build_registry_address_to_script_hash_key(&address);
         self.update_value(address.registry_id, &key, script_hash)?;
diff --git a/crates/hash/Cargo.toml b/gwos/crates/hash/Cargo.toml
similarity index 91%
rename from crates/hash/Cargo.toml
rename to gwos/crates/hash/Cargo.toml
index d2cf66935..0033899b6 100644
--- a/crates/hash/Cargo.toml
+++ b/gwos/crates/hash/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-hash"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 
diff --git a/crates/hash/src/blake2b.rs b/gwos/crates/hash/src/blake2b.rs
similarity index 100%
rename from crates/hash/src/blake2b.rs
rename to gwos/crates/hash/src/blake2b.rs
diff --git a/crates/hash/src/lib.rs b/gwos/crates/hash/src/lib.rs
similarity index 100%
rename from crates/hash/src/lib.rs
rename to gwos/crates/hash/src/lib.rs
diff --git a/crates/types/Cargo.toml b/gwos/crates/types/Cargo.toml
similarity index 78%
rename from crates/types/Cargo.toml
rename to gwos/crates/types/Cargo.toml
index 16f96d8c6..7cb51024f 100644
--- a/crates/types/Cargo.toml
+++ b/gwos/crates/types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-types"
-version = "1.8.0-rc1"
+version = "1.8.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 
@@ -8,7 +8,7 @@ edition = "2018"
 
 [features]
 default = ["std"]
-std = ["molecule/std", "sparse-merkle-tree/std", "ckb-fixed-hash", "ckb-types"]
+std = ["molecule/std", "ckb-fixed-hash", "ckb-types"]
 deprecated = []
 
 [dependencies]
@@ -16,6 +16,5 @@ molecule = { version = "0.7.2", default-features = false }
 cfg-if = "0.1"
 gw-hash = { path = "../hash", default-features = false }
 ckb-fixed-hash = { version = "0.105.1", optional = true }
-sparse-merkle-tree = { version = "0.6.1", default-features = false }
 ckb-types = { version = "0.105.1", default-features = false, optional = true }
 primitive-types = { version = "0.12", default-features = false, features = [ "impl-serde", "impl-rlp" ] }
diff --git a/crates/types/build.rs b/gwos/crates/types/build.rs
similarity index 100%
rename from crates/types/build.rs
rename to gwos/crates/types/build.rs
diff --git a/crates/types/schemas/block_sync.mol b/gwos/crates/types/schemas/block_sync.mol
similarity index 100%
rename from crates/types/schemas/block_sync.mol
rename to gwos/crates/types/schemas/block_sync.mol
diff --git a/crates/types/schemas/blockchain.mol b/gwos/crates/types/schemas/blockchain.mol
similarity index 100%
rename from crates/types/schemas/blockchain.mol
rename to gwos/crates/types/schemas/blockchain.mol
diff --git a/crates/types/schemas/deprecated.mol b/gwos/crates/types/schemas/deprecated.mol
similarity index 100%
rename from crates/types/schemas/deprecated.mol
rename to gwos/crates/types/schemas/deprecated.mol
diff --git a/crates/types/schemas/exported_block.mol b/gwos/crates/types/schemas/exported_block.mol
similarity index 100%
rename from crates/types/schemas/exported_block.mol
rename to gwos/crates/types/schemas/exported_block.mol
diff --git a/crates/types/schemas/godwoken.mol b/gwos/crates/types/schemas/godwoken.mol
similarity index 98%
rename from crates/types/schemas/godwoken.mol
rename to gwos/crates/types/schemas/godwoken.mol
index c7611a533..692897b79 100644
--- a/crates/types/schemas/godwoken.mol
+++ b/gwos/crates/types/schemas/godwoken.mol
@@ -189,7 +189,7 @@ table DepositLockArgs {
 table CustodianLockArgs {
     deposit_block_hash: Byte32,
     // Timepoint format
-    deposit_block_timepoint: Uint64,
+    deposit_finalized_timepoint: Uint64,
     // used for revert this cell to deposit request cell
     // after finalize, this lock is meaningless
     deposit_lock_args: DepositLockArgs,
@@ -206,7 +206,7 @@ struct UnlockCustodianViaRevertWitness {
 struct WithdrawalLockArgs {
     withdrawal_block_hash: Byte32,
     // Timepoint format
-    withdrawal_block_timepoint: Uint64,
+    withdrawal_finalized_timepoint: Uint64,
     account_script_hash: Byte32,
     // layer1 lock to withdraw after challenge period
     owner_lock_hash: Byte32,
@@ -228,7 +228,7 @@ struct UnlockWithdrawalViaRevert {
 struct StakeLockArgs {
     owner_lock_hash: Byte32,
     // Timepoint format
-    stake_block_timepoint: Uint64,
+    stake_finalized_timepoint: Uint64,
 }
 // --- end of stake lock ---
 
diff --git a/crates/types/schemas/mem_block.mol b/gwos/crates/types/schemas/mem_block.mol
similarity index 100%
rename from crates/types/schemas/mem_block.mol
rename to gwos/crates/types/schemas/mem_block.mol
diff --git a/crates/types/schemas/omni_lock.mol b/gwos/crates/types/schemas/omni_lock.mol
similarity index 100%
rename from crates/types/schemas/omni_lock.mol
rename to gwos/crates/types/schemas/omni_lock.mol
diff --git a/crates/types/schemas/store.mol b/gwos/crates/types/schemas/store.mol
similarity index 100%
rename from crates/types/schemas/store.mol
rename to gwos/crates/types/schemas/store.mol
diff --git a/crates/types/schemas/xudt_rce.mol b/gwos/crates/types/schemas/xudt_rce.mol
similarity index 100%
rename from crates/types/schemas/xudt_rce.mol
rename to gwos/crates/types/schemas/xudt_rce.mol
diff --git a/crates/types/src/conversion/blockchain.rs b/gwos/crates/types/src/conversion/blockchain.rs
similarity index 100%
rename from crates/types/src/conversion/blockchain.rs
rename to gwos/crates/types/src/conversion/blockchain.rs
diff --git a/crates/types/src/conversion/ckb_h256.rs b/gwos/crates/types/src/conversion/ckb_h256.rs
similarity index 100%
rename from crates/types/src/conversion/ckb_h256.rs
rename to gwos/crates/types/src/conversion/ckb_h256.rs
diff --git a/crates/types/src/conversion/exported_block.rs b/gwos/crates/types/src/conversion/exported_block.rs
similarity index 98%
rename from crates/types/src/conversion/exported_block.rs
rename to gwos/crates/types/src/conversion/exported_block.rs
index 49cb367eb..3511bf5c3 100644
--- a/crates/types/src/conversion/exported_block.rs
+++ b/gwos/crates/types/src/conversion/exported_block.rs
@@ -1,5 +1,4 @@
-use sparse_merkle_tree::H256;
-
+use crate::h256::H256;
 use crate::offchain::ExportedBlock;
 use crate::{packed, prelude::*};
 
diff --git a/crates/types/src/conversion/godwoken.rs b/gwos/crates/types/src/conversion/godwoken.rs
similarity index 100%
rename from crates/types/src/conversion/godwoken.rs
rename to gwos/crates/types/src/conversion/godwoken.rs
diff --git a/crates/types/src/conversion/mem_block.rs b/gwos/crates/types/src/conversion/mem_block.rs
similarity index 99%
rename from crates/types/src/conversion/mem_block.rs
rename to gwos/crates/types/src/conversion/mem_block.rs
index 3d6d419dc..07b6802f5 100644
--- a/crates/types/src/conversion/mem_block.rs
+++ b/gwos/crates/types/src/conversion/mem_block.rs
@@ -1,5 +1,4 @@
-use sparse_merkle_tree::H256;
-
+use crate::h256::H256;
 use crate::offchain::{CellInfo, DepositInfo, FinalizedCustodianCapacity, SudtCustodian};
 use crate::registry_address::RegistryAddress;
 use crate::{packed, prelude::*, vec::Vec};
diff --git a/crates/types/src/conversion/mod.rs b/gwos/crates/types/src/conversion/mod.rs
similarity index 80%
rename from crates/types/src/conversion/mod.rs
rename to gwos/crates/types/src/conversion/mod.rs
index 2c85d7d38..9525102b9 100644
--- a/crates/types/src/conversion/mod.rs
+++ b/gwos/crates/types/src/conversion/mod.rs
@@ -1,3 +1,4 @@
+#[cfg_attr(not(feature = "std"), allow(unused_macros))]
 #[macro_use]
 mod utilities;
 mod blockchain;
@@ -9,6 +10,5 @@ mod godwoken;
 #[cfg(feature = "std")]
 mod mem_block;
 mod primitive;
-mod smt_h256;
 #[cfg(feature = "std")]
 mod store;
diff --git a/crates/types/src/conversion/primitive.rs b/gwos/crates/types/src/conversion/primitive.rs
similarity index 100%
rename from crates/types/src/conversion/primitive.rs
rename to gwos/crates/types/src/conversion/primitive.rs
diff --git a/crates/types/src/conversion/store.rs b/gwos/crates/types/src/conversion/store.rs
similarity index 100%
rename from crates/types/src/conversion/store.rs
rename to gwos/crates/types/src/conversion/store.rs
diff --git a/crates/types/src/conversion/utilities.rs b/gwos/crates/types/src/conversion/utilities.rs
similarity index 100%
rename from crates/types/src/conversion/utilities.rs
rename to gwos/crates/types/src/conversion/utilities.rs
diff --git a/crates/types/src/core.rs b/gwos/crates/types/src/core.rs
similarity index 99%
rename from crates/types/src/core.rs
rename to gwos/crates/types/src/core.rs
index fc808539a..2b96b54c2 100644
--- a/crates/types/src/core.rs
+++ b/gwos/crates/types/src/core.rs
@@ -6,7 +6,7 @@ use core::convert::TryFrom;
 use core::convert::TryInto;
 
 // re-export H256
-pub use sparse_merkle_tree::H256;
+pub use crate::h256::H256;
 
 #[derive(Clone, Copy, PartialEq, Eq)]
 pub enum ScriptHashType {
diff --git a/crates/types/src/extension.rs b/gwos/crates/types/src/extension.rs
similarity index 100%
rename from crates/types/src/extension.rs
rename to gwos/crates/types/src/extension.rs
diff --git a/crates/types/src/finality.rs b/gwos/crates/types/src/finality.rs
similarity index 100%
rename from crates/types/src/finality.rs
rename to gwos/crates/types/src/finality.rs
diff --git a/crates/types/src/generated/block_sync.rs b/gwos/crates/types/src/generated/block_sync.rs
similarity index 100%
rename from crates/types/src/generated/block_sync.rs
rename to gwos/crates/types/src/generated/block_sync.rs
diff --git a/crates/types/src/generated/blockchain.rs b/gwos/crates/types/src/generated/blockchain.rs
similarity index 100%
rename from crates/types/src/generated/blockchain.rs
rename to gwos/crates/types/src/generated/blockchain.rs
diff --git a/crates/types/src/generated/deprecated.rs b/gwos/crates/types/src/generated/deprecated.rs
similarity index 100%
rename from crates/types/src/generated/deprecated.rs
rename to gwos/crates/types/src/generated/deprecated.rs
diff --git a/crates/types/src/generated/exported_block.rs b/gwos/crates/types/src/generated/exported_block.rs
similarity index 100%
rename from crates/types/src/generated/exported_block.rs
rename to gwos/crates/types/src/generated/exported_block.rs
diff --git a/crates/types/src/generated/godwoken.rs b/gwos/crates/types/src/generated/godwoken.rs
similarity index 99%
rename from crates/types/src/generated/godwoken.rs
rename to gwos/crates/types/src/generated/godwoken.rs
index 4c7d4e8bf..f6079e2f0 100644
--- a/crates/types/src/generated/godwoken.rs
+++ b/gwos/crates/types/src/generated/godwoken.rs
@@ -7482,8 +7482,8 @@ impl ::core::fmt::Display for CustodianLockArgs {
         write!(
             f,
             ", {}: {}",
-            "deposit_block_timepoint",
-            self.deposit_block_timepoint()
+            "deposit_finalized_timepoint",
+            self.deposit_finalized_timepoint()
         )?;
         write!(f, ", {}: {}", "deposit_lock_args", self.deposit_lock_args())?;
         let extra_count = self.count_extra_fields();
@@ -7531,7 +7531,7 @@ impl CustodianLockArgs {
         let end = molecule::unpack_number(&slice[8..]) as usize;
         Byte32::new_unchecked(self.0.slice(start..end))
     }
-    pub fn deposit_block_timepoint(&self) -> Uint64 {
+    pub fn deposit_finalized_timepoint(&self) -> Uint64 {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[8..]) as usize;
         let end = molecule::unpack_number(&slice[12..]) as usize;
@@ -7575,7 +7575,7 @@ impl molecule::prelude::Entity for CustodianLockArgs {
     fn as_builder(self) -> Self::Builder {
         Self::new_builder()
             .deposit_block_hash(self.deposit_block_hash())
-            .deposit_block_timepoint(self.deposit_block_timepoint())
+            .deposit_finalized_timepoint(self.deposit_finalized_timepoint())
             .deposit_lock_args(self.deposit_lock_args())
     }
 }
@@ -7602,8 +7602,8 @@ impl<'r> ::core::fmt::Display for CustodianLockArgsReader<'r> {
         write!(
             f,
             ", {}: {}",
-            "deposit_block_timepoint",
-            self.deposit_block_timepoint()
+            "deposit_finalized_timepoint",
+            self.deposit_finalized_timepoint()
         )?;
         write!(f, ", {}: {}", "deposit_lock_args", self.deposit_lock_args())?;
         let extra_count = self.count_extra_fields();
@@ -7637,7 +7637,7 @@ impl<'r> CustodianLockArgsReader<'r> {
         let end = molecule::unpack_number(&slice[8..]) as usize;
         Byte32Reader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn deposit_block_timepoint(&self) -> Uint64Reader<'r> {
+    pub fn deposit_finalized_timepoint(&self) -> Uint64Reader<'r> {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[8..]) as usize;
         let end = molecule::unpack_number(&slice[12..]) as usize;
@@ -7712,7 +7712,7 @@ impl<'r> molecule::prelude::Reader<'r> for CustodianLockArgsReader<'r> {
 #[derive(Debug, Default)]
 pub struct CustodianLockArgsBuilder {
     pub(crate) deposit_block_hash: Byte32,
-    pub(crate) deposit_block_timepoint: Uint64,
+    pub(crate) deposit_finalized_timepoint: Uint64,
     pub(crate) deposit_lock_args: DepositLockArgs,
 }
 impl CustodianLockArgsBuilder {
@@ -7721,8 +7721,8 @@ impl CustodianLockArgsBuilder {
         self.deposit_block_hash = v;
         self
     }
-    pub fn deposit_block_timepoint(mut self, v: Uint64) -> Self {
-        self.deposit_block_timepoint = v;
+    pub fn deposit_finalized_timepoint(mut self, v: Uint64) -> Self {
+        self.deposit_finalized_timepoint = v;
         self
     }
     pub fn deposit_lock_args(mut self, v: DepositLockArgs) -> Self {
@@ -7736,7 +7736,7 @@ impl molecule::prelude::Builder for CustodianLockArgsBuilder {
     fn expected_length(&self) -> usize {
         molecule::NUMBER_SIZE * (Self::FIELD_COUNT + 1)
             + self.deposit_block_hash.as_slice().len()
-            + self.deposit_block_timepoint.as_slice().len()
+            + self.deposit_finalized_timepoint.as_slice().len()
             + self.deposit_lock_args.as_slice().len()
     }
     fn write<W: molecule::io::Write>(&self, writer: &mut W) -> molecule::io::Result<()> {
@@ -7745,7 +7745,7 @@ impl molecule::prelude::Builder for CustodianLockArgsBuilder {
         offsets.push(total_size);
         total_size += self.deposit_block_hash.as_slice().len();
         offsets.push(total_size);
-        total_size += self.deposit_block_timepoint.as_slice().len();
+        total_size += self.deposit_finalized_timepoint.as_slice().len();
         offsets.push(total_size);
         total_size += self.deposit_lock_args.as_slice().len();
         writer.write_all(&molecule::pack_number(total_size as molecule::Number))?;
@@ -7753,7 +7753,7 @@ impl molecule::prelude::Builder for CustodianLockArgsBuilder {
             writer.write_all(&molecule::pack_number(offset as molecule::Number))?;
         }
         writer.write_all(self.deposit_block_hash.as_slice())?;
-        writer.write_all(self.deposit_block_timepoint.as_slice())?;
+        writer.write_all(self.deposit_finalized_timepoint.as_slice())?;
         writer.write_all(self.deposit_lock_args.as_slice())?;
         Ok(())
     }
@@ -7943,8 +7943,8 @@ impl ::core::fmt::Display for WithdrawalLockArgs {
         write!(
             f,
             ", {}: {}",
-            "withdrawal_block_timepoint",
-            self.withdrawal_block_timepoint()
+            "withdrawal_finalized_timepoint",
+            self.withdrawal_finalized_timepoint()
         )?;
         write!(
             f,
@@ -7974,7 +7974,7 @@ impl WithdrawalLockArgs {
     pub fn withdrawal_block_hash(&self) -> Byte32 {
         Byte32::new_unchecked(self.0.slice(0..32))
     }
-    pub fn withdrawal_block_timepoint(&self) -> Uint64 {
+    pub fn withdrawal_finalized_timepoint(&self) -> Uint64 {
         Uint64::new_unchecked(self.0.slice(32..40))
     }
     pub fn account_script_hash(&self) -> Byte32 {
@@ -8011,7 +8011,7 @@ impl molecule::prelude::Entity for WithdrawalLockArgs {
     fn as_builder(self) -> Self::Builder {
         Self::new_builder()
             .withdrawal_block_hash(self.withdrawal_block_hash())
-            .withdrawal_block_timepoint(self.withdrawal_block_timepoint())
+            .withdrawal_finalized_timepoint(self.withdrawal_finalized_timepoint())
             .account_script_hash(self.account_script_hash())
             .owner_lock_hash(self.owner_lock_hash())
     }
@@ -8044,8 +8044,8 @@ impl<'r> ::core::fmt::Display for WithdrawalLockArgsReader<'r> {
         write!(
             f,
             ", {}: {}",
-            "withdrawal_block_timepoint",
-            self.withdrawal_block_timepoint()
+            "withdrawal_finalized_timepoint",
+            self.withdrawal_finalized_timepoint()
         )?;
         write!(
             f,
@@ -8064,7 +8064,7 @@ impl<'r> WithdrawalLockArgsReader<'r> {
     pub fn withdrawal_block_hash(&self) -> Byte32Reader<'r> {
         Byte32Reader::new_unchecked(&self.as_slice()[0..32])
     }
-    pub fn withdrawal_block_timepoint(&self) -> Uint64Reader<'r> {
+    pub fn withdrawal_finalized_timepoint(&self) -> Uint64Reader<'r> {
         Uint64Reader::new_unchecked(&self.as_slice()[32..40])
     }
     pub fn account_script_hash(&self) -> Byte32Reader<'r> {
@@ -8098,7 +8098,7 @@ impl<'r> molecule::prelude::Reader<'r> for WithdrawalLockArgsReader<'r> {
 #[derive(Debug, Default)]
 pub struct WithdrawalLockArgsBuilder {
     pub(crate) withdrawal_block_hash: Byte32,
-    pub(crate) withdrawal_block_timepoint: Uint64,
+    pub(crate) withdrawal_finalized_timepoint: Uint64,
     pub(crate) account_script_hash: Byte32,
     pub(crate) owner_lock_hash: Byte32,
 }
@@ -8110,8 +8110,8 @@ impl WithdrawalLockArgsBuilder {
         self.withdrawal_block_hash = v;
         self
     }
-    pub fn withdrawal_block_timepoint(mut self, v: Uint64) -> Self {
-        self.withdrawal_block_timepoint = v;
+    pub fn withdrawal_finalized_timepoint(mut self, v: Uint64) -> Self {
+        self.withdrawal_finalized_timepoint = v;
         self
     }
     pub fn account_script_hash(mut self, v: Byte32) -> Self {
@@ -8131,7 +8131,7 @@ impl molecule::prelude::Builder for WithdrawalLockArgsBuilder {
     }
     fn write<W: molecule::io::Write>(&self, writer: &mut W) -> molecule::io::Result<()> {
         writer.write_all(self.withdrawal_block_hash.as_slice())?;
-        writer.write_all(self.withdrawal_block_timepoint.as_slice())?;
+        writer.write_all(self.withdrawal_finalized_timepoint.as_slice())?;
         writer.write_all(self.account_script_hash.as_slice())?;
         writer.write_all(self.owner_lock_hash.as_slice())?;
         Ok(())
@@ -8850,8 +8850,8 @@ impl ::core::fmt::Display for StakeLockArgs {
         write!(
             f,
             ", {}: {}",
-            "stake_block_timepoint",
-            self.stake_block_timepoint()
+            "stake_finalized_timepoint",
+            self.stake_finalized_timepoint()
         )?;
         write!(f, " }}")
     }
@@ -8872,7 +8872,7 @@ impl StakeLockArgs {
     pub fn owner_lock_hash(&self) -> Byte32 {
         Byte32::new_unchecked(self.0.slice(0..32))
     }
-    pub fn stake_block_timepoint(&self) -> Uint64 {
+    pub fn stake_finalized_timepoint(&self) -> Uint64 {
         Uint64::new_unchecked(self.0.slice(32..40))
     }
     pub fn as_reader<'r>(&'r self) -> StakeLockArgsReader<'r> {
@@ -8903,7 +8903,7 @@ impl molecule::prelude::Entity for StakeLockArgs {
     fn as_builder(self) -> Self::Builder {
         Self::new_builder()
             .owner_lock_hash(self.owner_lock_hash())
-            .stake_block_timepoint(self.stake_block_timepoint())
+            .stake_finalized_timepoint(self.stake_finalized_timepoint())
     }
 }
 #[derive(Clone, Copy)]
@@ -8929,8 +8929,8 @@ impl<'r> ::core::fmt::Display for StakeLockArgsReader<'r> {
         write!(
             f,
             ", {}: {}",
-            "stake_block_timepoint",
-            self.stake_block_timepoint()
+            "stake_finalized_timepoint",
+            self.stake_finalized_timepoint()
         )?;
         write!(f, " }}")
     }
@@ -8942,7 +8942,7 @@ impl<'r> StakeLockArgsReader<'r> {
     pub fn owner_lock_hash(&self) -> Byte32Reader<'r> {
         Byte32Reader::new_unchecked(&self.as_slice()[0..32])
     }
-    pub fn stake_block_timepoint(&self) -> Uint64Reader<'r> {
+    pub fn stake_finalized_timepoint(&self) -> Uint64Reader<'r> {
         Uint64Reader::new_unchecked(&self.as_slice()[32..40])
     }
 }
@@ -8970,7 +8970,7 @@ impl<'r> molecule::prelude::Reader<'r> for StakeLockArgsReader<'r> {
 #[derive(Debug, Default)]
 pub struct StakeLockArgsBuilder {
     pub(crate) owner_lock_hash: Byte32,
-    pub(crate) stake_block_timepoint: Uint64,
+    pub(crate) stake_finalized_timepoint: Uint64,
 }
 impl StakeLockArgsBuilder {
     pub const TOTAL_SIZE: usize = 40;
@@ -8980,8 +8980,8 @@ impl StakeLockArgsBuilder {
         self.owner_lock_hash = v;
         self
     }
-    pub fn stake_block_timepoint(mut self, v: Uint64) -> Self {
-        self.stake_block_timepoint = v;
+    pub fn stake_finalized_timepoint(mut self, v: Uint64) -> Self {
+        self.stake_finalized_timepoint = v;
         self
     }
 }
@@ -8993,7 +8993,7 @@ impl molecule::prelude::Builder for StakeLockArgsBuilder {
     }
     fn write<W: molecule::io::Write>(&self, writer: &mut W) -> molecule::io::Result<()> {
         writer.write_all(self.owner_lock_hash.as_slice())?;
-        writer.write_all(self.stake_block_timepoint.as_slice())?;
+        writer.write_all(self.stake_finalized_timepoint.as_slice())?;
         Ok(())
     }
     fn build(&self) -> Self::Entity {
diff --git a/crates/types/src/generated/mem_block.rs b/gwos/crates/types/src/generated/mem_block.rs
similarity index 100%
rename from crates/types/src/generated/mem_block.rs
rename to gwos/crates/types/src/generated/mem_block.rs
diff --git a/crates/types/src/generated/mod.rs b/gwos/crates/types/src/generated/mod.rs
similarity index 100%
rename from crates/types/src/generated/mod.rs
rename to gwos/crates/types/src/generated/mod.rs
diff --git a/crates/types/src/generated/omni_lock.rs b/gwos/crates/types/src/generated/omni_lock.rs
similarity index 100%
rename from crates/types/src/generated/omni_lock.rs
rename to gwos/crates/types/src/generated/omni_lock.rs
diff --git a/crates/types/src/generated/poa.rs b/gwos/crates/types/src/generated/poa.rs
similarity index 100%
rename from crates/types/src/generated/poa.rs
rename to gwos/crates/types/src/generated/poa.rs
diff --git a/crates/types/src/generated/store.rs b/gwos/crates/types/src/generated/store.rs
similarity index 100%
rename from crates/types/src/generated/store.rs
rename to gwos/crates/types/src/generated/store.rs
diff --git a/crates/types/src/generated/xudt_rce.rs b/gwos/crates/types/src/generated/xudt_rce.rs
similarity index 100%
rename from crates/types/src/generated/xudt_rce.rs
rename to gwos/crates/types/src/generated/xudt_rce.rs
diff --git a/crates/common/src/h256_ext.rs b/gwos/crates/types/src/h256.rs
similarity index 78%
rename from crates/common/src/h256_ext.rs
rename to gwos/crates/types/src/h256.rs
index 2285cd8bf..196457f3c 100644
--- a/crates/common/src/h256_ext.rs
+++ b/gwos/crates/types/src/h256.rs
@@ -1,9 +1,14 @@
-// type aliases
+use primitive_types::U256;
 
-use gw_types::U256;
-pub use sparse_merkle_tree::H256;
+/// Represent 256 bits
+pub type H256 = [u8; 32];
+
+const ZERO: H256 = [0u8; 32];
 
 pub trait H256Ext {
+    fn zero() -> Self;
+    fn is_zero(&self) -> bool;
+    fn as_slice(&self) -> &[u8];
     fn one() -> H256;
     fn from_u32(n: u32) -> H256;
     fn to_u32(&self) -> u32;
@@ -16,44 +21,64 @@ pub trait H256Ext {
 }
 
 impl H256Ext for H256 {
+    fn zero() -> Self {
+        ZERO
+    }
+
+    fn is_zero(&self) -> bool {
+        self == &ZERO
+    }
+
+    fn as_slice(&self) -> &[u8] {
+        &self[..]
+    }
+
     fn one() -> H256 {
         H256::from_u32(1)
     }
+
     fn from_u32(n: u32) -> H256 {
         let mut buf = [0u8; 32];
         buf[..4].copy_from_slice(&n.to_le_bytes());
-        buf.into()
+        buf
     }
+
     fn to_u32(&self) -> u32 {
         let mut n_bytes = [0u8; 4];
         n_bytes.copy_from_slice(&self.as_slice()[..4]);
         u32::from_le_bytes(n_bytes)
     }
+
     fn from_u64(n: u64) -> H256 {
         let mut buf = [0u8; 32];
         buf[..8].copy_from_slice(&n.to_le_bytes());
-        buf.into()
+        buf
     }
+
     fn to_u64(&self) -> u64 {
         let mut n_bytes = [0u8; 8];
         n_bytes.copy_from_slice(&self.as_slice()[..8]);
         u64::from_le_bytes(n_bytes)
     }
+
     fn from_u128(n: u128) -> H256 {
         let mut buf = [0u8; 32];
         buf[..16].copy_from_slice(&n.to_le_bytes());
-        buf.into()
+        buf
     }
+
     fn to_u128(&self) -> u128 {
         let mut n_bytes = [0u8; 16];
         n_bytes.copy_from_slice(&self.as_slice()[..16]);
         u128::from_le_bytes(n_bytes)
     }
+
     fn from_u256(n: U256) -> H256 {
         let mut buf = [0u8; 32];
         n.to_little_endian(&mut buf);
-        buf.into()
+        buf
     }
+
     fn to_u256(&self) -> U256 {
         let mut n_bytes = [0u8; 32];
         n_bytes.copy_from_slice(&self.as_slice()[..32]);
diff --git a/crates/types/src/lib.rs b/gwos/crates/types/src/lib.rs
similarity index 98%
rename from crates/types/src/lib.rs
rename to gwos/crates/types/src/lib.rs
index 2b9fd3531..84fe78ce5 100644
--- a/crates/types/src/lib.rs
+++ b/gwos/crates/types/src/lib.rs
@@ -8,6 +8,7 @@ pub mod core;
 mod extension;
 mod finality;
 mod generated;
+pub mod h256;
 pub mod prelude;
 pub mod registry_address;
 mod std_traits;
diff --git a/crates/types/src/offchain/compatible_finalized_timepoint.rs b/gwos/crates/types/src/offchain/compatible_finalized_timepoint.rs
similarity index 100%
rename from crates/types/src/offchain/compatible_finalized_timepoint.rs
rename to gwos/crates/types/src/offchain/compatible_finalized_timepoint.rs
diff --git a/crates/types/src/offchain/error_receipt.rs b/gwos/crates/types/src/offchain/error_receipt.rs
similarity index 88%
rename from crates/types/src/offchain/error_receipt.rs
rename to gwos/crates/types/src/offchain/error_receipt.rs
index 8d3602fbb..63ef3c6c4 100644
--- a/crates/types/src/offchain/error_receipt.rs
+++ b/gwos/crates/types/src/offchain/error_receipt.rs
@@ -1,8 +1,7 @@
 use crate::bytes::Bytes;
+use crate::h256::H256;
 use crate::packed::LogItem;
 
-use sparse_merkle_tree::H256;
-
 #[derive(Debug, Clone)]
 pub struct ErrorTxReceipt {
     pub tx_hash: H256,
diff --git a/crates/types/src/offchain/exported_block.rs b/gwos/crates/types/src/offchain/exported_block.rs
similarity index 94%
rename from crates/types/src/offchain/exported_block.rs
rename to gwos/crates/types/src/offchain/exported_block.rs
index 91d7f5b0d..bf29fc52d 100644
--- a/crates/types/src/offchain/exported_block.rs
+++ b/gwos/crates/types/src/offchain/exported_block.rs
@@ -1,6 +1,5 @@
-use sparse_merkle_tree::H256;
-
 use crate::{
+    h256::H256,
     packed::{DepositInfoVec, GlobalState, L2Block, Script, WithdrawalRequestExtra},
     prelude::{Entity, Unpack},
 };
@@ -22,7 +21,7 @@ impl ExportedBlock {
     }
 
     pub fn block_hash(&self) -> H256 {
-        self.block.hash().into()
+        self.block.hash()
     }
 
     pub fn parent_block_hash(&self) -> H256 {
diff --git a/crates/types/src/offchain/extension.rs b/gwos/crates/types/src/offchain/extension.rs
similarity index 96%
rename from crates/types/src/offchain/extension.rs
rename to gwos/crates/types/src/offchain/extension.rs
index 1b3f85b7c..1e2c2b0d5 100644
--- a/crates/types/src/offchain/extension.rs
+++ b/gwos/crates/types/src/offchain/extension.rs
@@ -1,5 +1,6 @@
 use core::convert::TryInto;
 
+use crate::h256::H256;
 use crate::packed::{
     AccountMerkleState, Byte32, CompactMemBlock, DeprecatedCompactMemBlock, GlobalState,
     GlobalStateV0, MemBlock, RawWithdrawalRequest, TransactionKey, TxReceipt, WithdrawalKey,
@@ -7,7 +8,6 @@ use crate::packed::{
 };
 use crate::prelude::*;
 use ckb_types::error::VerificationError;
-use sparse_merkle_tree::H256;
 
 use super::RunResult;
 
@@ -21,8 +21,7 @@ impl TransactionKey {
     }
 
     pub fn block_hash(&self) -> H256 {
-        let h: [u8; 32] = self.as_slice()[..32].try_into().unwrap();
-        h.into()
+        self.as_slice()[..32].try_into().unwrap()
     }
 
     pub fn index(&self) -> u32 {
diff --git a/crates/types/src/offchain/generator.rs b/gwos/crates/types/src/offchain/generator.rs
similarity index 100%
rename from crates/types/src/offchain/generator.rs
rename to gwos/crates/types/src/offchain/generator.rs
diff --git a/crates/types/src/offchain/mem_block.rs b/gwos/crates/types/src/offchain/mem_block.rs
similarity index 80%
rename from crates/types/src/offchain/mem_block.rs
rename to gwos/crates/types/src/offchain/mem_block.rs
index f1a244251..f3347522b 100644
--- a/crates/types/src/offchain/mem_block.rs
+++ b/gwos/crates/types/src/offchain/mem_block.rs
@@ -1,5 +1,4 @@
-use sparse_merkle_tree::H256;
-
+use crate::h256::H256;
 use crate::packed::Script;
 
 pub struct SudtCustodian {
diff --git a/crates/types/src/offchain/mod.rs b/gwos/crates/types/src/offchain/mod.rs
similarity index 100%
rename from crates/types/src/offchain/mod.rs
rename to gwos/crates/types/src/offchain/mod.rs
diff --git a/crates/types/src/offchain/pool.rs b/gwos/crates/types/src/offchain/pool.rs
similarity index 98%
rename from crates/types/src/offchain/pool.rs
rename to gwos/crates/types/src/offchain/pool.rs
index c8691ddef..86537928c 100644
--- a/crates/types/src/offchain/pool.rs
+++ b/gwos/crates/types/src/offchain/pool.rs
@@ -1,7 +1,7 @@
 use std::collections::{hash_map::Entry, HashMap};
 
+use crate::h256::H256;
 use ckb_types::bytes::Bytes;
-use sparse_merkle_tree::H256;
 
 use crate::packed::{AccountMerkleState, L2Block, L2Transaction, Script, WithdrawalRequestExtra};
 
diff --git a/crates/types/src/offchain/rpc.rs b/gwos/crates/types/src/offchain/rpc.rs
similarity index 100%
rename from crates/types/src/offchain/rpc.rs
rename to gwos/crates/types/src/offchain/rpc.rs
diff --git a/crates/types/src/offchain/run_result.rs b/gwos/crates/types/src/offchain/run_result.rs
similarity index 97%
rename from crates/types/src/offchain/run_result.rs
rename to gwos/crates/types/src/offchain/run_result.rs
index 8de05e96d..e14d8d190 100644
--- a/crates/types/src/offchain/run_result.rs
+++ b/gwos/crates/types/src/offchain/run_result.rs
@@ -1,7 +1,7 @@
 use crate::bytes::Bytes;
+use crate::h256::H256;
 use crate::packed::{CellOutput, LogItem, Script};
 use crate::prelude::*;
-use sparse_merkle_tree::H256;
 use std::collections::HashSet;
 
 use super::CycleMeter;
diff --git a/crates/types/src/offchain/store.rs b/gwos/crates/types/src/offchain/store.rs
similarity index 77%
rename from crates/types/src/offchain/store.rs
rename to gwos/crates/types/src/offchain/store.rs
index 748b61f0b..5d24d135e 100644
--- a/crates/types/src/offchain/store.rs
+++ b/gwos/crates/types/src/offchain/store.rs
@@ -1,4 +1,4 @@
-use sparse_merkle_tree::H256;
+use crate::h256::H256;
 
 pub struct SMTRevertedBlockHashes {
     pub prev_smt_root: H256,
diff --git a/crates/types/src/prelude.rs b/gwos/crates/types/src/prelude.rs
similarity index 100%
rename from crates/types/src/prelude.rs
rename to gwos/crates/types/src/prelude.rs
diff --git a/crates/types/src/registry_address.rs b/gwos/crates/types/src/registry_address.rs
similarity index 100%
rename from crates/types/src/registry_address.rs
rename to gwos/crates/types/src/registry_address.rs
diff --git a/crates/types/src/signature_message.rs b/gwos/crates/types/src/signature_message.rs
similarity index 92%
rename from crates/types/src/signature_message.rs
rename to gwos/crates/types/src/signature_message.rs
index cdf6e093e..5bdca2326 100644
--- a/crates/types/src/signature_message.rs
+++ b/gwos/crates/types/src/signature_message.rs
@@ -1,8 +1,7 @@
-use gw_hash::blake2b::new_blake2b;
-use sparse_merkle_tree::H256;
-
+use crate::h256::H256;
 use crate::packed::{RawL2Transaction, RawWithdrawalRequest};
 use crate::prelude::*;
+use gw_hash::blake2b::new_blake2b;
 
 impl RawL2Transaction {
     pub fn calc_message(
@@ -18,7 +17,7 @@ impl RawL2Transaction {
         hasher.update(self.as_slice());
         let mut message = [0u8; 32];
         hasher.finalize(&mut message);
-        message.into()
+        message
     }
 }
 
@@ -29,6 +28,6 @@ impl RawWithdrawalRequest {
         hasher.update(self.as_slice());
         let mut message = [0u8; 32];
         hasher.finalize(&mut message);
-        message.into()
+        message
     }
 }
diff --git a/crates/types/src/std_traits.rs b/gwos/crates/types/src/std_traits.rs
similarity index 100%
rename from crates/types/src/std_traits.rs
rename to gwos/crates/types/src/std_traits.rs
diff --git a/gwos/rust-toolchain b/gwos/rust-toolchain
index 2dc8d3e58..835011600 100644
--- a/gwos/rust-toolchain
+++ b/gwos/rust-toolchain
@@ -1 +1 @@
-nightly-2022-03-31
+nightly-2022-08-01