From 2f1615802c284fd1ffbe64a9944187e6f344fd61 Mon Sep 17 00:00:00 2001
From: quake <quake.wang@gmail.com>
Date: Wed, 22 May 2024 14:09:17 +0900
Subject: [PATCH 1/5] parent 63b234516064ce2480c4a2c238a20bcad255840e author
 quake <quake.wang@gmail.com> 1716354557 +0900 committer quake
 <quake.wang@gmail.com> 1716793125 +0900

feat: add store impl
---
 Cargo.lock                                    | 380 +++++++++++++++---
 Cargo.toml                                    |   6 +-
 src/ckb/channel.rs                            | 218 ++++++++--
 src/ckb/network.rs                            |  68 +++-
 src/ckb/serde_utils.rs                        |  63 +--
 src/ckb/test_utils.rs                         |  37 ++
 src/ckb/types.rs                              |  10 +-
 src/ckb_chain/funding/funding_tx.rs           |   6 +-
 src/invoice/invoice_impl.rs                   |   6 +-
 src/lib.rs                                    |   1 +
 src/storage.rs                                |  57 +++
 src/store.rs                                  | 152 +++++++
 .../3-nodes-transfer/11-node3-gen-invoice.bru |   3 +
 tests/deploy/run-dev-node.sh                  |  52 +++
 14 files changed, 903 insertions(+), 156 deletions(-)
 create mode 100644 src/storage.rs
 create mode 100644 src/store.rs
 create mode 100755 tests/deploy/run-dev-node.sh

diff --git a/Cargo.lock b/Cargo.lock
index c346ef52..2d8c3788 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -261,6 +261,29 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445"
 
+[[package]]
+name = "bindgen"
+version = "0.68.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078"
+dependencies = [
+ "bitflags 2.5.0",
+ "cexpr",
+ "clang-sys",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "peeking_take_while",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn 2.0.52",
+ "which",
+]
+
 [[package]]
 name = "bit-vec"
 version = "0.6.3"
@@ -323,6 +346,9 @@ name = "bitflags"
 version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "blake2b-ref"
@@ -351,9 +377,12 @@ dependencies = [
 
 [[package]]
 name = "bs58"
-version = "0.4.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
+checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4"
+dependencies = [
+ "tinyvec",
+]
 
 [[package]]
 name = "bumpalo"
@@ -382,7 +411,7 @@ version = "12.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "142316461ed3a3dfcba10417317472da5bfd0461e4d276bf7c07b330766d9490"
 dependencies = [
- "digest 0.10.7",
+ "digest",
  "either",
  "futures",
  "hex",
@@ -408,6 +437,19 @@ name = "cc"
 version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
+dependencies = [
+ "jobserver",
+ "libc",
+]
+
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
 
 [[package]]
 name = "cfg-if"
@@ -613,7 +655,7 @@ dependencies = [
  "ckb-fixed-hash",
  "ckb-hash 0.114.0",
  "ckb-occupied-capacity",
- "molecule",
+ "molecule 0.7.5",
  "numext-fixed-uint",
 ]
 
@@ -649,6 +691,20 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "ckb-librocksdb-sys"
+version = "8.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e68e0993f54ba0d21152419a0668caa92adc928b5a9b01e45871ec055a31ce2"
+dependencies = [
+ "bindgen",
+ "cc",
+ "glob",
+ "libc",
+ "pkg-config",
+ "rust-ini",
+]
+
 [[package]]
 name = "ckb-logger"
 version = "0.114.0"
@@ -725,6 +781,7 @@ dependencies = [
  "ckb-crypto",
  "ckb-hash 0.115.0",
  "ckb-jsonrpc-types",
+ "ckb-rocksdb",
  "ckb-sdk",
  "ckb-testtool",
  "ckb-types",
@@ -734,7 +791,6 @@ dependencies = [
  "futures",
  "hex",
  "home",
- "libc",
  "lightning",
  "lightning-background-processor",
  "lightning-block-sync",
@@ -743,7 +799,7 @@ dependencies = [
  "lightning-persister",
  "lightning-rapid-gossip-sync",
  "log",
- "molecule",
+ "molecule 0.7.5",
  "musig2",
  "nom",
  "once_cell",
@@ -801,6 +857,17 @@ dependencies = [
  "walkdir",
 ]
 
+[[package]]
+name = "ckb-rocksdb"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "050f7c70a451b9606a5d4e1cf696fec2517e65c3bfcbefadb6b114cc0fa7673b"
+dependencies = [
+ "ckb-librocksdb-sys",
+ "libc",
+ "tempfile",
+]
+
 [[package]]
 name = "ckb-script"
 version = "0.114.0"
@@ -930,7 +997,7 @@ dependencies = [
  "derive_more",
  "golomb-coded-set",
  "merkle-cbt",
- "molecule",
+ "molecule 0.7.5",
  "numext-fixed-uint",
  "once_cell",
  "paste",
@@ -993,6 +1060,17 @@ dependencies = [
  "paste",
 ]
 
+[[package]]
+name = "clang-sys"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
 [[package]]
 name = "clap"
 version = "4.5.2"
@@ -1061,6 +1139,26 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
+[[package]]
+name = "const-random"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
+dependencies = [
+ "const-random-macro",
+]
+
+[[package]]
+name = "const-random-macro"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
+dependencies = [
+ "getrandom 0.2.12",
+ "once_cell",
+ "tiny-keccak",
+]
+
 [[package]]
 name = "convert_case"
 version = "0.4.0"
@@ -1116,6 +1214,12 @@ version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
 
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -1135,17 +1239,31 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
 
 [[package]]
 name = "curve25519-dalek"
-version = "3.2.0"
+version = "4.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
+checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348"
 dependencies = [
- "byteorder",
- "digest 0.9.0",
- "rand_core 0.5.1",
+ "cfg-if 1.0.0",
+ "cpufeatures",
+ "curve25519-dalek-derive",
+ "fiat-crypto",
+ "platforms",
+ "rustc_version",
  "subtle",
  "zeroize",
 ]
 
+[[package]]
+name = "curve25519-dalek-derive"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.52",
+]
+
 [[package]]
 name = "darling"
 version = "0.20.8"
@@ -1228,15 +1346,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "digest"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -1248,6 +1357,15 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "dlv-list"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f"
+dependencies = [
+ "const-random",
+]
+
 [[package]]
 name = "dyn-clone"
 version = "1.0.17"
@@ -1344,6 +1462,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ad8c7269456fd609f700340399dca5fa160c4785c9623f87b6079e5a479f28b"
 
+[[package]]
+name = "fiat-crypto"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
+
 [[package]]
 name = "flate2"
 version = "1.0.28"
@@ -1490,10 +1614,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
 dependencies = [
  "cfg-if 1.0.0",
- "js-sys",
  "libc",
  "wasi 0.9.0+wasi-snapshot-preview1",
- "wasm-bindgen",
 ]
 
 [[package]]
@@ -1503,8 +1625,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
 dependencies = [
  "cfg-if 1.0.0",
+ "js-sys",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -1513,6 +1637,12 @@ version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
 [[package]]
 name = "goblin"
 version = "0.2.3"
@@ -1572,6 +1702,12 @@ dependencies = [
  "ahash 0.7.8",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+
 [[package]]
 name = "hashbrown"
 version = "0.14.3"
@@ -1627,7 +1763,7 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
 dependencies = [
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -1888,6 +2024,15 @@ version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
 
+[[package]]
+name = "jobserver"
+version = "0.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "js-sys"
 version = "0.3.69"
@@ -1927,12 +2072,28 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
 [[package]]
 name = "libc"
 version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
+[[package]]
+name = "libloading"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
+dependencies = [
+ "cfg-if 1.0.0",
+ "windows-targets 0.52.4",
+]
+
 [[package]]
 name = "lightning"
 version = "0.0.121"
@@ -2140,6 +2301,17 @@ dependencies = [
  "faster-hex",
 ]
 
+[[package]]
+name = "molecule"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6efe1c7efcd0bdf4ca590e104bcb13087d9968956ae4ae98e92fb8c1da0f3730"
+dependencies = [
+ "bytes",
+ "cfg-if 1.0.0",
+ "faster-hex",
+]
+
 [[package]]
 name = "musig2"
 version = "0.0.11"
@@ -2327,6 +2499,16 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "ordered-multimap"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e"
+dependencies = [
+ "dlv-list",
+ "hashbrown 0.13.2",
+]
+
 [[package]]
 name = "parking_lot"
 version = "0.12.1"
@@ -2356,6 +2538,12 @@ version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
 
+[[package]]
+name = "peeking_take_while"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -2444,6 +2632,12 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
 
+[[package]]
+name = "platforms"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7"
+
 [[package]]
 name = "poly1305"
 version = "0.8.0"
@@ -2467,6 +2661,16 @@ version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
+[[package]]
+name = "prettyplease"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.52",
+]
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -2696,17 +2900,27 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.16.20"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
+ "cfg-if 1.0.0",
+ "getrandom 0.2.12",
  "libc",
- "once_cell",
  "spin",
  "untrusted",
- "web-sys",
- "winapi",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rust-ini"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091"
+dependencies = [
+ "cfg-if 1.0.0",
+ "ordered-multimap",
 ]
 
 [[package]]
@@ -2715,6 +2929,12 @@ version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
 [[package]]
 name = "rustc_version"
 version = "0.4.0"
@@ -2847,6 +3067,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "secp256k1"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3"
+dependencies = [
+ "secp256k1-sys 0.10.0",
+]
+
 [[package]]
 name = "secp256k1-sys"
 version = "0.6.1"
@@ -2874,6 +3103,15 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "secp256k1-sys"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1433bd67156263443f14d603720b082dd3121779323fce20cba2aa07b874bc1b"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "security-framework"
 version = "2.9.2"
@@ -3017,7 +3255,7 @@ checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c"
 dependencies = [
  "cfg-if 1.0.0",
  "cpufeatures",
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -3028,7 +3266,7 @@ checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
  "cfg-if 1.0.0",
  "cpufeatures",
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -3039,7 +3277,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
  "cfg-if 1.0.0",
  "cpufeatures",
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -3048,10 +3286,16 @@ version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
 dependencies = [
- "digest 0.10.7",
+ "digest",
  "keccak",
 ]
 
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.1"
@@ -3115,9 +3359,9 @@ dependencies = [
 
 [[package]]
 name = "spin"
-version = "0.5.2"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 
 [[package]]
 name = "ssri"
@@ -3126,7 +3370,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da7a2b3c2bc9693bcb40870c4e9b5bf0d79f9cb46273321bf855ec513e919082"
 dependencies = [
  "base64 0.21.7",
- "digest 0.10.7",
+ "digest",
  "hex",
  "miette",
  "serde",
@@ -3223,9 +3467,8 @@ dependencies = [
 
 [[package]]
 name = "tentacle"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ffbbdb4f54a9605ceda168884efcf5fb24ef655103362af211e6cfe61eff832"
+version = "0.6.0"
+source = "git+https://github.com/nervosnetwork/tentacle?branch=bump-to-0.6.0#f61c53bee718a256a3b5dee17a927cf5bf6270a4"
 dependencies = [
  "async-trait",
  "bytes",
@@ -3233,7 +3476,7 @@ dependencies = [
  "js-sys",
  "libc",
  "log",
- "molecule",
+ "molecule 0.8.0",
  "nohash-hasher",
  "once_cell",
  "rand 0.8.5",
@@ -3251,9 +3494,8 @@ dependencies = [
 
 [[package]]
 name = "tentacle-multiaddr"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "895b25a7de42f7bba27b011495a4a48ea7f0591c079f59c8fdb07936ca8aa3d1"
+version = "0.3.4"
+source = "git+https://github.com/nervosnetwork/tentacle?branch=bump-to-0.6.0#f61c53bee718a256a3b5dee17a927cf5bf6270a4"
 dependencies = [
  "bs58",
  "bytes",
@@ -3264,24 +3506,23 @@ dependencies = [
 
 [[package]]
 name = "tentacle-secio"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78a41abd9ae459d1f744f59670d8f4e9a25c4597b12b9060740fbd17bf9687fc"
+version = "0.6.2"
+source = "git+https://github.com/nervosnetwork/tentacle?branch=bump-to-0.6.0#f61c53bee718a256a3b5dee17a927cf5bf6270a4"
 dependencies = [
  "bs58",
  "bytes",
  "chacha20poly1305",
  "futures",
+ "getrandom 0.2.12",
  "hmac",
  "log",
- "molecule",
+ "molecule 0.8.0",
  "openssl",
  "openssl-sys",
- "rand 0.7.3",
  "rand 0.8.5",
- "rand_core 0.5.1",
+ "rand_core 0.6.4",
  "ring",
- "secp256k1 0.24.3",
+ "secp256k1 0.29.0",
  "sha2",
  "tokio",
  "tokio-util",
@@ -3340,6 +3581,15 @@ dependencies = [
  "time-core",
 ]
 
+[[package]]
+name = "tiny-keccak"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+dependencies = [
+ "crunchy",
+]
+
 [[package]]
 name = "tinyvec"
 version = "1.6.0"
@@ -3425,8 +3675,7 @@ dependencies = [
 [[package]]
 name = "tokio-yamux"
 version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2ed88a04bfbf9e70343a5748a423200ee0591c55e7e487d784a55ee8af17db9"
+source = "git+https://github.com/nervosnetwork/tentacle?branch=bump-to-0.6.0#f61c53bee718a256a3b5dee17a927cf5bf6270a4"
 dependencies = [
  "bytes",
  "futures",
@@ -3562,15 +3811,15 @@ checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b"
 
 [[package]]
 name = "unsigned-varint"
-version = "0.7.2"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105"
+checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06"
 
 [[package]]
 name = "untrusted"
-version = "0.7.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
@@ -3708,6 +3957,18 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "which"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+dependencies = [
+ "either",
+ "home",
+ "once_cell",
+ "rustix",
+]
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -3921,12 +4182,13 @@ dependencies = [
 
 [[package]]
 name = "x25519-dalek"
-version = "1.1.1"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f"
+checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277"
 dependencies = [
  "curve25519-dalek",
- "rand_core 0.5.1",
+ "rand_core 0.6.4",
+ "serde",
  "zeroize",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index f3b1f0d4..beb23123 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,7 +24,6 @@ base64 = "0.13.0"
 bitcoin = { version = "0.30.2", features = ["serde", "rand"] }
 bitcoin-bech32 = "0.12"
 bech32 = "0.8"
-libc = "0.2"
 chrono = { version = "0.4", default-features = false, features = ["clock"] }
 rand = "0.8.5"
 serde_json = { version = "1.0" }
@@ -43,7 +42,7 @@ ckb-sdk = "3.1.0"
 thiserror = "1.0.58"
 anyhow = "1.0.81"
 env_logger = "0.11.3"
-tentacle = "0.4.2"
+tentacle = { git = "https://github.com/nervosnetwork/tentacle", branch = "bump-to-0.6.0" }
 log = "0.4.21"
 futures = "0.3.30"
 once_cell = "1.19.0"
@@ -52,11 +51,12 @@ molecule = { version = "0.7.5", default-features = false }
 ckb-types = "0.114.0"
 ckb-jsonrpc-types = "0.114.0"
 ckb-crypto = "0.114.0"
+rocksdb = { package = "ckb-rocksdb", version ="=0.21.1", features = ["snappy"], default-features = false }
 serde_with = { version = "3.7.0", features = ["macros", "base64"] }
 hex = "0.4.3"
 tower = "0.4.13"
 axum = { version = "0.7.5", features = ["json"] }
-bitflags = "2.5.0"
+bitflags = { version = "2.5.0", features = ["serde"] }
 ckb-hash = "0.115.0"
 secp256k1 = { version = "0.28.0", features = ["serde", "recovery"] }
 musig2 = { version = "0.0.11", features = ["secp256k1", "serde"] }
diff --git a/src/ckb/channel.rs b/src/ckb/channel.rs
index d7be4dfe..948d7936 100644
--- a/src/ckb/channel.rs
+++ b/src/ckb/channel.rs
@@ -20,7 +20,7 @@ use ractor::{
 };
 
 use serde::{Deserialize, Serialize};
-use serde_with::serde_as;
+use serde_with::{serde_as, DisplayFromStr};
 use tentacle::secio::PeerId;
 use thiserror::Error;
 use tokio::sync::{mpsc::error::TrySendError, oneshot};
@@ -40,7 +40,7 @@ use crate::{
 use super::{
     key::blake2b_hash_with_salt,
     network::PCNMessageWithPeerId,
-    serde_utils::EntityWrapperHex,
+    serde_utils::EntityHex,
     types::{
         AcceptChannel, AddTlc, ChannelReady, ClosingSigned, CommitmentSigned, Hash256, LockTime,
         OpenChannel, PCNMessage, Privkey, Pubkey, RemoveTlc, RemoveTlcReason, RevokeAndAck,
@@ -103,7 +103,7 @@ pub struct RemoveTlcCommand {
 #[serde_as]
 #[derive(Clone, Debug, Deserialize)]
 pub struct ShutdownCommand {
-    #[serde_as(as = "EntityWrapperHex<Script>")]
+    #[serde_as(as = "EntityHex")]
     close_script: Script,
     fee: u128,
 }
@@ -130,7 +130,7 @@ pub const DEFAULT_TO_LOCAL_DELAY_BLOCKS: u64 = 10;
 #[serde_as]
 #[derive(Clone, Debug, Deserialize)]
 pub struct TxUpdateCommand {
-    #[serde_as(as = "EntityWrapperHex<Transaction>")]
+    #[serde_as(as = "EntityHex")]
     pub transaction: Transaction,
 }
 
@@ -152,6 +152,8 @@ pub enum ChannelInitializationParameter {
         OpenChannel,
         Option<oneshot::Sender<Hash256>>,
     ),
+    /// Reestablish a channel with given channel id.
+    ReestablishChannel(Hash256),
 }
 
 #[derive(Debug)]
@@ -488,7 +490,7 @@ impl ChannelActor {
                 state.update_state(ChannelState::CollaboratingFundingTx(
                     CollaboratingFundingTxFlags::AWAITING_REMOTE_TX_COLLABORATION_MSG,
                 ));
-                state.funding_tx = Some(tx_update.transaction.clone().into_view());
+                state.funding_tx = Some(tx_update.transaction.clone());
                 state.maybe_complete_tx_collaboration(
                     tx_update.transaction.clone(),
                     self.network.clone(),
@@ -749,6 +751,23 @@ impl Actor for ChannelActor {
                 tx.send(channel.get_id()).expect("Receive not dropped");
                 Ok(channel)
             }
+            ChannelInitializationParameter::ReestablishChannel(channel_id) => {
+                let channel = self
+                    .store
+                    .get_channel_actor_state(&channel_id)
+                    .expect("channel should exist");
+
+                self.network
+                    .send_message(NetworkActorMessage::new_event(
+                        NetworkActorEvent::ChannelCreated(
+                            channel.get_id(),
+                            self.peer_id.clone(),
+                            myself,
+                        ),
+                    ))
+                    .expect("network actor alive");
+                Ok(channel)
+            }
         }
     }
 
@@ -811,6 +830,7 @@ impl Actor for ChannelActor {
                 }
             },
         }
+        self.store.insert_channel_actor_state(state.clone());
         Ok(())
     }
 }
@@ -832,12 +852,14 @@ impl From<Transaction> for FundingTxInput {
     }
 }
 
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[serde_as]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct ChannelActorState {
     pub state: ChannelState,
+    #[serde_as(as = "DisplayFromStr")]
     pub peer_id: PeerId,
     pub id: Hash256,
-    pub funding_tx: Option<TransactionView>,
+    pub funding_tx: Option<Transaction>,
 
     // Is this channel initially inbound?
     // An inbound channel is one where the counterparty is the funder of the channel.
@@ -852,6 +874,7 @@ pub struct ChannelActorState {
     // Cached channel parameter for easier of access.
     pub local_channel_parameters: ChannelParametersOneParty,
     // The holder has set a shutdown script.
+    #[serde_as(as = "Option<EntityHex>")]
     pub local_shutdown_script: Option<Script>,
 
     // Commitment numbers that are used to derive keys.
@@ -874,6 +897,7 @@ pub struct ChannelActorState {
     pub pending_received_tlcs: HashMap<u64, TLC>,
 
     // The counterparty has already sent a shutdown message with this script.
+    #[serde_as(as = "Option<EntityHex>")]
     pub remote_shutdown_script: Option<Script>,
 
     pub remote_nonce: Option<PubNonce>,
@@ -924,14 +948,16 @@ pub enum ProcessingChannelError {
 }
 
 bitflags! {
-    #[derive(Copy, Clone, Debug, PartialEq, Eq)]
+    #[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+    #[serde(transparent)]
     pub struct NegotiatingFundingFlags: u32 {
         const OUR_INIT_SENT = 1;
         const THEIR_INIT_SENT = 1 << 1;
         const INIT_SENT = NegotiatingFundingFlags::OUR_INIT_SENT.bits() | NegotiatingFundingFlags::THEIR_INIT_SENT.bits();
     }
 
-    #[derive(Copy, Clone, Debug, PartialEq, Eq)]
+    #[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+    #[serde(transparent)]
     pub struct CollaboratingFundingTxFlags: u32 {
         const AWAITING_REMOTE_TX_COLLABORATION_MSG = 1;
         const PREPARING_LOCAL_TX_COLLABORATION_MSG = 1 << 1;
@@ -940,28 +966,32 @@ bitflags! {
         const COLLABRATION_COMPLETED = CollaboratingFundingTxFlags::OUR_TX_COMPLETE_SENT.bits() | CollaboratingFundingTxFlags::THEIR_TX_COMPLETE_SENT.bits();
     }
 
-    #[derive(Copy, Clone, Debug, PartialEq, Eq)]
+    #[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+    #[serde(transparent)]
     pub struct SigningCommitmentFlags: u32 {
         const OUR_COMMITMENT_SIGNED_SENT = 1;
         const THEIR_COMMITMENT_SIGNED_SENT = 1 << 1;
         const COMMITMENT_SIGNED_SENT = SigningCommitmentFlags::OUR_COMMITMENT_SIGNED_SENT.bits() | SigningCommitmentFlags::THEIR_COMMITMENT_SIGNED_SENT.bits();
     }
 
-    #[derive(Copy, Clone, Debug, PartialEq, Eq)]
+    #[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+    #[serde(transparent)]
     pub struct AwaitingTxSignaturesFlags: u32 {
         const OUR_TX_SIGNATURES_SENT = 1;
         const THEIR_TX_SIGNATURES_SENT = 1 << 1;
         const TX_SIGNATURES_SENT = AwaitingTxSignaturesFlags::OUR_TX_SIGNATURES_SENT.bits() | AwaitingTxSignaturesFlags::THEIR_TX_SIGNATURES_SENT.bits();
     }
 
-    #[derive(Copy, Clone, Debug, PartialEq, Eq)]
+    #[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+    #[serde(transparent)]
     pub struct AwaitingChannelReadyFlags: u32 {
         const OUR_CHANNEL_READY = 1;
         const THEIR_CHANNEL_READY = 1 << 1;
         const CHANNEL_READY = AwaitingChannelReadyFlags::OUR_CHANNEL_READY.bits() | AwaitingChannelReadyFlags::THEIR_CHANNEL_READY.bits();
     }
 
-    #[derive(Copy, Clone, Debug, PartialEq, Eq)]
+    #[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+    #[serde(transparent)]
     pub struct ChannelReadyFlags: u32 {
         /// Indicates that we have sent a `commitment_signed` but are awaiting the responding
         ///	`revoke_and_ack` message. During this period, we can't generate new messages as
@@ -970,7 +1000,8 @@ bitflags! {
         const AWAITING_REMOTE_REVOKE = 1;
     }
 
-    #[derive(Copy, Clone, Debug, PartialEq, Eq)]
+    #[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+    #[serde(transparent)]
     pub struct ShuttingDownFlags: u32 {
         /// Indicates that we have sent a `shutdown` message.
         const OUR_SHUTDOWN_SENT = 1;
@@ -992,7 +1023,7 @@ enum CommitmentSignedFlags {
     ChannelReady(ChannelReadyFlags),
 }
 
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum ChannelState {
     /// We are negotiating the parameters required for the channel prior to funding it.
     NegotiatingFunding(NegotiatingFundingFlags),
@@ -1221,21 +1252,16 @@ impl ChannelActorState {
         }
     }
 
-    pub fn get_funding_transaction(&self) -> &TransactionView {
+    pub fn get_funding_transaction(&self) -> &Transaction {
         self.funding_tx
             .as_ref()
             .expect("Funding transaction is present")
     }
 
     pub fn get_funding_transaction_outpoint(&self) -> OutPoint {
-        let tx = self
-            .funding_tx
-            .as_ref()
-            .expect("Funding transaction is present");
+        let tx = self.get_funding_transaction();
         // By convention, the funding tx output for the channel is the first output.
-        tx.output_pts_iter()
-            .next()
-            .expect("Funding transaction output is present")
+        OutPoint::new(tx.calc_tx_hash(), 0)
     }
 
     pub fn get_local_shutdown_script(&self) -> &Script {
@@ -1523,19 +1549,20 @@ impl ChannelActorState {
                         .collect();
                     debug!(
                         "Updating funding tx witnesses of {:?} to {:?}",
-                        self.get_funding_transaction().hash(),
+                        self.get_funding_transaction().calc_tx_hash(),
                         new_witnesses.iter().map(|x| hex::encode(x.as_slice()))
                     );
                     self.funding_tx = Some(
                         self.get_funding_transaction()
                             .as_advanced_builder()
                             .set_witnesses(new_witnesses)
-                            .build(),
+                            .build()
+                            .data(),
                     );
                     network
                         .send_message(NetworkActorMessage::new_event(
                             NetworkActorEvent::FundingTransactionPending(
-                                self.get_funding_transaction().data(),
+                                self.get_funding_transaction().clone(),
                                 self.get_funding_transaction_outpoint(),
                                 self.get_id(),
                             ),
@@ -1996,7 +2023,7 @@ impl ChannelActorState {
         match msg {
             TxCollaborationMsg::TxUpdate(msg) => {
                 // TODO check if the tx is valid.
-                self.funding_tx = Some(msg.tx.clone().into_view());
+                self.funding_tx = Some(msg.tx.clone());
                 if self.is_tx_final(&msg.tx)? {
                     self.maybe_complete_tx_collaboration(msg.tx, network)?;
                 } else {
@@ -2330,7 +2357,7 @@ impl ChannelActorState {
                 NetworkActorCommand::SignTx(
                     self.peer_id.clone(),
                     self.get_id(),
-                    funding_tx.data(),
+                    funding_tx,
                     partial_witnesses,
                 ),
             ))
@@ -2437,7 +2464,8 @@ impl ChannelActorState {
                     tx
                 );
                 let first_output =
-                    tx.outputs()
+                    tx.raw()
+                        .outputs()
                         .get(0)
                         .ok_or(ProcessingChannelError::InvalidParameter(
                             "Funding transaction should have at least one output".to_string(),
@@ -2485,7 +2513,7 @@ impl ChannelActorState {
                     dbg!("outpoint: {:?}", &outpoint);
                     dbg!("Cell: {:?}", &cell);
                     context.create_cell_with_out_point(outpoint, cell, cell_data);
-                    self.funding_tx = Some(funding_tx);
+                    self.funding_tx = Some(funding_tx.data());
                 }
             }
         }
@@ -2881,6 +2909,11 @@ impl ChannelActorState {
         Ok(tx)
     }
 }
+pub trait ChannelActorStateStore {
+    fn get_channel_actor_state(&self, id: &Hash256) -> Option<ChannelActorState>;
+    fn insert_channel_actor_state(&self, state: ChannelActorState);
+    fn get_channels(&self, peer_id: &PeerId) -> Vec<Hash256>;
+}
 
 /// A wrapper on CommitmentTransaction that has a partial signature along with
 /// the ckb transaction.
@@ -3031,7 +3064,7 @@ pub fn aggregate_partial_signatures_for_commitment_tx(
         .build())
 }
 
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct ChannelParametersOneParty {
     pub pubkeys: ChannelBasePublicKeys,
     pub selected_contest_delay: LockTime,
@@ -3060,7 +3093,7 @@ impl ChannelParametersOneParty {
 }
 
 /// One counterparty's public keys which do not change over the life of a channel.
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct ChannelBasePublicKeys {
     /// The public key which is used to sign all commitment transactions, as it appears in the
     /// on-chain channel lock-in 2-of-2 multisig output.
@@ -3110,7 +3143,7 @@ impl From<&AcceptChannel> for ChannelBasePublicKeys {
 type ShortHash = [u8; 20];
 
 /// A tlc output.
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct TLC {
     /// The id of a received TLC. Must be empty if this is an offered HTLC.
     /// We will fill in the id when we send this tlc to the counterparty.
@@ -3215,7 +3248,7 @@ pub fn derive_private_key(secret: &Privkey, _per_commitment_point: &Pubkey) -> P
 ///
 /// This implementation performs no policy checks and is insufficient by itself as
 /// a secure external signer.
-#[derive(Clone, Eq, PartialEq, Debug)]
+#[derive(Clone, Eq, PartialEq, Debug, Serialize, Deserialize)]
 pub struct InMemorySigner {
     /// Holder secret key in the 2-of-2 multisig script of a channel. This key also backs the
     /// holder's anchor output in a commitment transaction, if one is present.
@@ -3624,4 +3657,121 @@ mod tests {
             })
             .await;
     }
+
+    #[tokio::test]
+    async fn test_reestablish_channel() {
+        let [mut node_a, mut node_b] = NetworkNode::new_n_interconnected_nodes(2)
+            .await
+            .try_into()
+            .unwrap();
+
+        node_a
+            .network_actor
+            .send_message(NetworkActorMessage::new_command(
+                NetworkActorCommand::OpenChannel(
+                    OpenChannelCommand {
+                        peer_id: node_b.peer_id.clone(),
+                        funding_amount: 1000,
+                    },
+                    None,
+                ),
+            ))
+            .expect("node_a alive");
+        let channel_id = node_b
+            .expect_to_process_event(|event| match event {
+                NetworkServiceEvent::ChannelPendingToBeAccepted(peer_id, channel_id) => {
+                    println!("A channel ({:?}) to {:?} create", &channel_id, peer_id);
+                    assert_eq!(peer_id, &node_a.peer_id);
+                    Some(channel_id.clone())
+                }
+                _ => None,
+            })
+            .await;
+
+        node_b
+            .network_actor
+            .send_message(NetworkActorMessage::new_command(
+                NetworkActorCommand::AcceptChannel(
+                    AcceptChannelCommand {
+                        temp_channel_id: channel_id.clone(),
+                        funding_amount: 1000,
+                    },
+                    None,
+                ),
+            ))
+            .expect("node_a alive");
+
+        node_a
+            .expect_event(|event| match event {
+                NetworkServiceEvent::ChannelCreated(peer_id, channel_id) => {
+                    println!("A channel ({:?}) to {:?} create", channel_id, peer_id);
+                    assert_eq!(peer_id, &node_b.peer_id);
+                    true
+                }
+                _ => false,
+            })
+            .await;
+
+        node_b
+            .expect_event(|event| match event {
+                NetworkServiceEvent::ChannelCreated(peer_id, channel_id) => {
+                    println!("A channel ({:?}) to {:?} create", channel_id, peer_id);
+                    assert_eq!(peer_id, &node_a.peer_id);
+                    true
+                }
+                _ => false,
+            })
+            .await;
+
+        node_a
+            .network_actor
+            .send_message(NetworkActorMessage::new_command(
+                NetworkActorCommand::DisconnectPeer(node_b.peer_id.clone()),
+            ))
+            .expect("node_a alive");
+
+        node_a
+            .expect_event(|event| match event {
+                NetworkServiceEvent::PeerDisConnected(peer_id, _) => {
+                    assert_eq!(peer_id, &node_b.peer_id);
+                    true
+                }
+                _ => false,
+            })
+            .await;
+
+        node_b
+            .expect_event(|event| match event {
+                NetworkServiceEvent::PeerDisConnected(peer_id, _) => {
+                    assert_eq!(peer_id, &node_a.peer_id);
+                    true
+                }
+                _ => false,
+            })
+            .await;
+
+        node_a.connect_to(&node_b).await;
+
+        node_a
+            .expect_event(|event| match event {
+                NetworkServiceEvent::ChannelCreated(peer_id, channel_id) => {
+                    println!("A channel ({:?}) to {:?} create", channel_id, peer_id);
+                    assert_eq!(peer_id, &node_b.peer_id);
+                    true
+                }
+                _ => false,
+            })
+            .await;
+
+        node_b
+            .expect_event(|event| match event {
+                NetworkServiceEvent::ChannelCreated(peer_id, channel_id) => {
+                    println!("A channel ({:?}) to {:?} create", channel_id, peer_id);
+                    assert_eq!(peer_id, &node_a.peer_id);
+                    true
+                }
+                _ => false,
+            })
+            .await;
+    }
 }
diff --git a/src/ckb/network.rs b/src/ckb/network.rs
index 186d7d21..b5b13016 100644
--- a/src/ckb/network.rs
+++ b/src/ckb/network.rs
@@ -6,7 +6,7 @@ use log::{debug, error, info, warn};
 
 use ractor::{
     async_trait as rasync_trait, call_t, Actor, ActorCell, ActorProcessingErr, ActorRef,
-    RpcReplyPort,
+    RpcReplyPort, SupervisionEvent,
 };
 use serde::{Deserialize, Serialize};
 use serde_with::{serde_as, DisplayFromStr, FromInto};
@@ -45,7 +45,7 @@ use super::{
 };
 
 use crate::ckb::channel::{TxCollaborationCommand, TxUpdateCommand};
-use crate::ckb::serde_utils::EntityWrapperHex;
+use crate::ckb::serde_utils::EntityHex;
 use crate::ckb::types::TxSignatures;
 use crate::ckb_chain::{CkbChainMessage, FundingRequest, FundingTx, TraceTxRequest};
 use crate::{unwrap_or_return, Error, RpcError};
@@ -75,6 +75,7 @@ pub struct AcceptChannelResponse {
 pub enum NetworkActorCommand {
     /// Network commands
     ConnectPeer(Multiaddr),
+    DisconnectPeer(#[serde_as(as = "DisplayFromStr")] PeerId),
     // For internal use and debugging only. Most of the messages requires some
     // changes to local state. Even if we can send a message to a peer, some
     // part of the local state is not changed.
@@ -95,13 +96,13 @@ pub enum NetworkActorCommand {
     ControlPcnChannel(ChannelCommandWithId),
     UpdateChannelFunding(
         Hash256,
-        #[serde_as(as = "EntityWrapperHex<Transaction>")] Transaction,
+        #[serde_as(as = "EntityHex")] Transaction,
         FundingRequest,
     ),
     SignTx(
         #[serde_as(as = "DisplayFromStr")] PeerId,
         Hash256,
-        #[serde_as(as = "EntityWrapperHex<Transaction>")] Transaction,
+        #[serde_as(as = "EntityHex")] Transaction,
         Option<Vec<Vec<u8>>>,
     ),
 }
@@ -314,6 +315,16 @@ impl NetworkActor {
                 // may receive errors like DialerError.
             }
 
+            NetworkActorCommand::DisconnectPeer(peer_id) => {
+                debug!(
+                    "DisconnectPeer command received, disconnecting peer {:?}",
+                    &peer_id
+                );
+                if let Some(session) = state.get_peer_session(&peer_id) {
+                    state.control.disconnect(session).await?;
+                }
+            }
+
             NetworkActorCommand::OpenChannel(open_channel, reply) => {
                 let (_, channel_id) = state.create_outbound_channel(open_channel).await?;
                 if let Some(reply) = reply {
@@ -627,9 +638,34 @@ impl NetworkActorState {
         }
     }
 
+<<<<<<< HEAD
     fn on_peer_connected(&mut self, id: &PeerId, session: &SessionContext) {
         debug!("Peer connected: {:?}, session id: {}", &id, session.id);
         self.peer_session_map.insert(id.clone(), session.id);
+=======
+    async fn on_peer_connected<S: ChannelActorStateStore + Clone + Send + Sync + 'static>(
+        &mut self,
+        peer_id: &PeerId,
+        session: &SessionContext,
+        store: S,
+    ) {
+        debug!("Peer connected: {:?}, session id: {}", &peer_id, session.id);
+        self.peer_session_map.insert(peer_id.clone(), session.id);
+
+        for channel_id in store.get_channels(&peer_id) {
+            debug!("Reestablishing channel {:?}", &channel_id);
+            if let Ok((channel, _)) = Actor::spawn_linked(
+                None,
+                ChannelActor::new(peer_id.clone(), self.network.clone(), store.clone()),
+                ChannelInitializationParameter::ReestablishChannel(channel_id),
+                self.network.get_cell(),
+            )
+            .await
+            {
+                self.on_channel_created(channel_id, peer_id, channel);
+            }
+        }
+>>>>>>> f1fde85 (parent 63b234516064ce2480c4a2c238a20bcad255840e)
     }
 
     fn on_peer_disconnected(&mut self, id: &PeerId, session: &SessionContext) {
@@ -817,7 +853,7 @@ impl Actor for NetworkActor {
         let handle = Handle::new(myself.clone());
         let mut service = ServiceBuilder::default()
             .insert_protocol(handle.clone().create_meta(PCN_PROTOCOL_ID))
-            .key_pair(secio_kp)
+            .handshake_type(secio_kp.into())
             .build(handle);
         let listen_addr = service
             .listen(
@@ -879,7 +915,9 @@ impl Actor for NetworkActor {
                     self.on_service_event(e).await;
                 }
                 NetworkActorEvent::PeerConnected(id, session) => {
-                    state.on_peer_connected(&id, &session);
+                    state
+                        .on_peer_connected(&id, &session, self.store.clone())
+                        .await;
                     // Notify outside observers.
                     myself
                         .send_message(NetworkActorMessage::new_event(
@@ -1030,6 +1068,24 @@ impl Actor for NetworkActor {
         debug!("Network service for {:?} shutdown", state.peer_id);
         Ok(())
     }
+
+    async fn handle_supervisor_evt(
+        &self,
+        _myself: ActorRef<Self::Msg>,
+        message: SupervisionEvent,
+        _state: &mut Self::State,
+    ) -> Result<(), ActorProcessingErr> {
+        match message {
+            SupervisionEvent::ActorTerminated(who, _, _) => {
+                debug!("Actor {:?} terminated", who);
+            }
+            SupervisionEvent::ActorPanicked(who, _) => {
+                error!("Actor {:?} panicked", who);
+            }
+            _ => {}
+        }
+        Ok(())
+    }
 }
 
 #[derive(Clone, Debug)]
diff --git a/src/ckb/serde_utils.rs b/src/ckb/serde_utils.rs
index c251f739..1311ca76 100644
--- a/src/ckb/serde_utils.rs
+++ b/src/ckb/serde_utils.rs
@@ -61,26 +61,26 @@ where
     serializer.serialize_str(&format!("0x{}", &hex::encode(e.as_ref())))
 }
 
-pub struct WrapperHex<E>(pub E);
+pub struct SliceHex;
 
-impl<E> SerializeAs<E> for WrapperHex<E>
+impl<T> SerializeAs<T> for SliceHex
 where
-    E: AsRef<[u8]>,
+    T: AsRef<[u8]>,
 {
-    fn serialize_as<S>(e: &E, serializer: S) -> Result<S::Ok, S::Error>
+    fn serialize_as<S>(source: &T, serializer: S) -> Result<S::Ok, S::Error>
     where
         S: Serializer,
     {
-        to_hex(e, serializer)
+        to_hex(source, serializer)
     }
 }
 
-impl<'de, E> DeserializeAs<'de, E> for WrapperHex<E>
+impl<'de, T> DeserializeAs<'de, T> for SliceHex
 where
-    E: TryFrom<Vec<u8>>,
-    E::Error: core::fmt::Debug,
+    T: TryFrom<Vec<u8>>,
+    T::Error: core::fmt::Debug,
 {
-    fn deserialize_as<D>(deserializer: D) -> Result<E, D::Error>
+    fn deserialize_as<D>(deserializer: D) -> Result<T, D::Error>
     where
         D: Deserializer<'de>,
     {
@@ -88,56 +88,29 @@ where
     }
 }
 
-pub struct EntityWrapperBase64<E: Entity>(pub E);
-
-impl<E> SerializeAs<E> for EntityWrapperBase64<E>
-where
-    E: Entity,
-{
-    fn serialize_as<S>(e: &E, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        to_base64(e.as_slice(), serializer)
-    }
-}
-
-impl<'de, E> DeserializeAs<'de, E> for EntityWrapperBase64<E>
-where
-    E: Entity,
-{
-    fn deserialize_as<D>(deserializer: D) -> Result<E, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        let v: Vec<u8> = from_base64(deserializer)?;
-        E::from_slice(&v).map_err(serde::de::Error::custom)
-    }
-}
-
-pub struct EntityWrapperHex<E: Entity>(pub E);
+pub struct EntityHex;
 
-impl<E> SerializeAs<E> for EntityWrapperHex<E>
+impl<T> SerializeAs<T> for EntityHex
 where
-    E: Entity,
+    T: Entity,
 {
-    fn serialize_as<S>(e: &E, serializer: S) -> Result<S::Ok, S::Error>
+    fn serialize_as<S>(source: &T, serializer: S) -> Result<S::Ok, S::Error>
     where
         S: Serializer,
     {
-        to_hex(e.as_slice(), serializer)
+        to_hex(source.as_slice(), serializer)
     }
 }
 
-impl<'de, E> DeserializeAs<'de, E> for EntityWrapperHex<E>
+impl<'de, T> DeserializeAs<'de, T> for EntityHex
 where
-    E: Entity,
+    T: Entity,
 {
-    fn deserialize_as<D>(deserializer: D) -> Result<E, D::Error>
+    fn deserialize_as<D>(deserializer: D) -> Result<T, D::Error>
     where
         D: Deserializer<'de>,
     {
         let v: Vec<u8> = from_hex(deserializer)?;
-        E::from_slice(&v).map_err(serde::de::Error::custom)
+        T::from_slice(&v).map_err(serde::de::Error::custom)
     }
 }
diff --git a/src/ckb/test_utils.rs b/src/ckb/test_utils.rs
index ea11ee63..f50a8cc9 100644
--- a/src/ckb/test_utils.rs
+++ b/src/ckb/test_utils.rs
@@ -206,6 +206,43 @@ impl NetworkNode {
     }
 }
 
+#[derive(Clone, Default)]
+struct MemoryStore {
+    channel_actor_state_map: Arc<RwLock<HashMap<Hash256, ChannelActorState>>>,
+}
+
+impl ChannelActorStateStore for MemoryStore {
+    fn get_channel_actor_state(&self, id: &Hash256) -> Option<ChannelActorState> {
+        self.channel_actor_state_map
+            .read()
+            .unwrap()
+            .get(id)
+            .cloned()
+    }
+
+    fn insert_channel_actor_state(&self, state: ChannelActorState) {
+        self.channel_actor_state_map
+            .write()
+            .unwrap()
+            .insert(state.id.clone(), state);
+    }
+
+    fn get_channels(&self, peer_id: &PeerId) -> Vec<Hash256> {
+        self.channel_actor_state_map
+            .read()
+            .unwrap()
+            .values()
+            .filter_map(|state| {
+                if peer_id == &state.peer_id {
+                    Some(state.id.clone())
+                } else {
+                    None
+                }
+            })
+            .collect()
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::NetworkNode;
diff --git a/src/ckb/types.rs b/src/ckb/types.rs
index 8d810fca..c364e419 100644
--- a/src/ckb/types.rs
+++ b/src/ckb/types.rs
@@ -1,7 +1,7 @@
 use std::str::FromStr;
 
 use super::gen::pcn::{self as molecule_pcn, PubNonce as Byte66, SignatureVec};
-use super::serde_utils::{EntityWrapperBase64, WrapperHex};
+use super::serde_utils::{EntityHex, SliceHex};
 use anyhow::anyhow;
 use ckb_sdk::{Since, SinceType};
 use ckb_types::packed::Uint64;
@@ -192,7 +192,7 @@ impl AsRef<[u8; 32]> for Privkey {
 
 #[serde_as]
 #[derive(Copy, Clone, Serialize, Deserialize, Hash, Eq, PartialEq, Default)]
-pub struct Hash256(#[serde_as(as = "WrapperHex<[u8; 32]>")] [u8; 32]);
+pub struct Hash256(#[serde_as(as = "SliceHex")] [u8; 32]);
 
 impl From<[u8; 32]> for Hash256 {
     fn from(value: [u8; 32]) -> Self {
@@ -429,7 +429,7 @@ impl TryFrom<Byte66> for PubNonce {
 pub struct OpenChannel {
     pub chain_hash: Hash256,
     pub channel_id: Hash256,
-    #[serde_as(as = "Option<EntityWrapperBase64<Script>>")]
+    #[serde_as(as = "Option<EntityHex>")]
     pub funding_type_script: Option<Script>,
     pub funding_amount: u128,
     pub funding_fee_rate: u64,
@@ -698,7 +698,7 @@ pub enum TxCollaborationMsg {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct TxUpdate {
     pub channel_id: Hash256,
-    #[serde_as(as = "EntityWrapperBase64<Transaction>")]
+    #[serde_as(as = "EntityHex")]
     pub tx: Transaction,
 }
 
@@ -825,7 +825,7 @@ impl TryFrom<molecule_pcn::TxAckRBF> for TxAckRBF {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Shutdown {
     pub channel_id: Hash256,
-    #[serde_as(as = "EntityWrapperBase64<Script>")]
+    #[serde_as(as = "EntityHex")]
     pub close_script: Script,
     pub fee: u128,
 }
diff --git a/src/ckb_chain/funding/funding_tx.rs b/src/ckb_chain/funding/funding_tx.rs
index 794152b4..3cb491e4 100644
--- a/src/ckb_chain/funding/funding_tx.rs
+++ b/src/ckb_chain/funding/funding_tx.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use super::super::FundingError;
-use crate::ckb::serde_utils::EntityWrapperHex;
+use crate::ckb::serde_utils::EntityHex;
 
 use ckb_sdk::{
     constants::SIGHASH_TYPE_HASH,
@@ -53,7 +53,7 @@ impl From<Transaction> for FundingTx {
 #[derive(Clone, Debug, Default, Deserialize)]
 pub struct FundingUdtInfo {
     /// The UDT type script
-    #[serde_as(as = "EntityWrapperHex<packed::Script>")]
+    #[serde_as(as = "EntityHex")]
     type_script: packed::Script,
     /// CKB amount to be provided by the local party.
     local_ckb_amount: u64,
@@ -67,7 +67,7 @@ pub struct FundingRequest {
     /// UDT channel info
     pub udt_info: Option<FundingUdtInfo>,
     /// The funding cell lock script args
-    #[serde_as(as = "EntityWrapperHex<Script>")]
+    #[serde_as(as = "EntityHex")]
     pub script: Script,
     /// Assets amount to be provided by the local party
     pub local_amount: u64,
diff --git a/src/invoice/invoice_impl.rs b/src/invoice/invoice_impl.rs
index 78f37da5..a0ab39e0 100644
--- a/src/invoice/invoice_impl.rs
+++ b/src/invoice/invoice_impl.rs
@@ -1,7 +1,11 @@
 use super::errors::VerificationError;
 use super::utils::*;
 use crate::ckb::gen::invoice::{self as gen_invoice, *};
+<<<<<<< HEAD
 use crate::ckb::serde_utils::EntityWrapperBase64;
+=======
+use crate::ckb::serde_utils::EntityHex;
+>>>>>>> f1fde85 (parent 63b234516064ce2480c4a2c238a20bcad255840e)
 use crate::ckb::types::Hash256;
 use crate::invoice::InvoiceError;
 use bech32::{encode, u5, FromBase32, ToBase32, Variant, WriteBase32};
@@ -127,7 +131,7 @@ impl FromStr for SiPrefix {
 
 #[serde_as]
 #[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
-pub struct CkbScript(#[serde_as(as = "EntityWrapperBase64<Script>")] pub Script);
+pub struct CkbScript(#[serde_as(as = "EntityHex")] pub Script);
 
 #[serde_as]
 #[derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize)]
diff --git a/src/lib.rs b/src/lib.rs
index 2617e39d..0c8027d1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -13,6 +13,7 @@ pub use cch::{start_cch, CchConfig};
 pub mod rpc;
 pub use rpc::{start_rpc, RpcConfig, RpcError};
 pub mod invoice;
+pub mod storage;
 
 mod errors;
 pub use errors::{Error, Result};
diff --git a/src/storage.rs b/src/storage.rs
new file mode 100644
index 00000000..cddf7d2e
--- /dev/null
+++ b/src/storage.rs
@@ -0,0 +1,57 @@
+use std::{
+    collections::{HashMap, HashSet},
+    path::Path,
+    sync::Arc,
+};
+
+use rocksdb::{prelude::*, Direction, IteratorMode, WriteBatch, DB};
+
+#[derive(Clone)]
+pub struct Storage {
+    pub(crate) db: Arc<DB>,
+}
+
+impl Storage {
+    pub fn new<P: AsRef<Path>>(path: P) -> Self {
+        let db = Arc::new(DB::open_default(path).expect("Failed to open rocksdb"));
+        Self { db }
+    }
+
+    fn get<K: AsRef<[u8]>>(&self, key: K) -> Result<Option<Vec<u8>>, Error> {
+        self.db.get(key.as_ref()).map(|v| v.map(|vi| vi.to_vec()))
+    }
+
+    fn batch(&self) -> Batch {
+        Batch {
+            db: Arc::clone(&self.db),
+            wb: WriteBatch::default(),
+        }
+    }
+}
+
+pub struct Batch {
+    db: Arc<DB>,
+    wb: WriteBatch,
+}
+
+impl Batch {
+    fn put_kv<K: Into<Vec<u8>>, V: Into<Vec<u8>>>(
+        &mut self,
+        key: K,
+        value: V,
+    ) -> Result<(), Error> {
+        self.put(&Into::<Vec<u8>>::into(key), &Into::<Vec<u8>>::into(value))
+    }
+
+    fn put<K: AsRef<[u8]>, V: AsRef<[u8]>>(&mut self, key: K, value: V) -> Result<(), Error> {
+        self.wb.put(key, value)
+    }
+
+    fn delete<K: AsRef<[u8]>>(&mut self, key: K) -> Result<(), Error> {
+        self.wb.delete(key.as_ref())
+    }
+
+    fn commit(self) -> Result<(), Error> {
+        self.db.write(&self.wb)
+    }
+}
diff --git a/src/store.rs b/src/store.rs
new file mode 100644
index 00000000..987e776a
--- /dev/null
+++ b/src/store.rs
@@ -0,0 +1,152 @@
+use std::{path::Path, sync::Arc};
+
+use bincode;
+use rocksdb::{prelude::*, WriteBatch, DB};
+use tentacle::secio::PeerId;
+
+use crate::{
+    ckb::{
+        channel::{ChannelActorState, ChannelActorStateStore, ChannelState},
+        types::Hash256,
+    },
+    invoice::{CkbInvoice, InvoiceStore},
+};
+
+#[derive(Clone)]
+pub struct Store {
+    pub(crate) db: Arc<DB>,
+}
+
+impl Store {
+    pub fn new<P: AsRef<Path>>(path: P) -> Self {
+        let db = Arc::new(DB::open_default(path).expect("Failed to open rocksdb"));
+        Self { db }
+    }
+
+    fn get<K: AsRef<[u8]>>(&self, key: K) -> Option<Vec<u8>> {
+        self.db
+            .get(key.as_ref())
+            .map(|v| v.map(|vi| vi.to_vec()))
+            .expect("get should be OK")
+    }
+
+    fn batch(&self) -> Batch {
+        Batch {
+            db: Arc::clone(&self.db),
+            wb: WriteBatch::default(),
+        }
+    }
+}
+
+pub struct Batch {
+    db: Arc<DB>,
+    wb: WriteBatch,
+}
+
+impl Batch {
+    fn put_kv(&mut self, key_value: KeyValue) {
+        let (key, value) = match key_value {
+            KeyValue::ChannelActorState(id, state) => {
+                let key = [&[0], id.as_ref()].concat();
+                (
+                    key,
+                    bincode::serialize(&state).expect("serialize ChannelActorState should be OK"),
+                )
+            }
+            KeyValue::CkbInvoice(id, invoice) => {
+                let key = [&[32], id.as_ref()].concat();
+                (
+                    key,
+                    bincode::serialize(&invoice).expect("serialize CkbInvoice should be OK"),
+                )
+            }
+            KeyValue::PeerIdChannelId((peer_id, channel_id), state) => {
+                let key = [&[64], peer_id.as_bytes(), channel_id.as_ref()].concat();
+                (
+                    key,
+                    bincode::serialize(&state).expect("serialize ChannelState should be OK"),
+                )
+            }
+        };
+        self.put(&Into::<Vec<u8>>::into(key), &Into::<Vec<u8>>::into(value))
+    }
+
+    fn put<K: AsRef<[u8]>, V: AsRef<[u8]>>(&mut self, key: K, value: V) {
+        self.wb.put(key, value).expect("put should be OK")
+    }
+
+    fn delete<K: AsRef<[u8]>>(&mut self, key: K) {
+        self.wb.delete(key.as_ref()).expect("delete should be OK")
+    }
+
+    fn commit(self) {
+        self.db.write(&self.wb).expect("commit should be OK")
+    }
+}
+
+///
+/// +--------------+--------------------+--------------------------+
+/// | KeyPrefix::  | Key::              | Value::                  |
+/// +--------------+--------------------+--------------------------+
+/// | 0            | Hash256            | ChannelActorState        |
+/// | 32           | Hash256            | CkbInvoice               |
+/// | 64           | PeerId | Hash256   | ChannelState             |
+/// +--------------+--------------------+--------------------------+
+///
+
+enum KeyValue {
+    ChannelActorState(Hash256, ChannelActorState),
+    CkbInvoice(Hash256, CkbInvoice),
+    PeerIdChannelId((PeerId, Hash256), ChannelState),
+}
+
+impl ChannelActorStateStore for Store {
+    fn get_channel_actor_state(&self, id: &Hash256) -> Option<ChannelActorState> {
+        let mut key = Vec::with_capacity(33);
+        key.extend_from_slice(&[0]);
+        key.extend_from_slice(id.as_ref());
+
+        self.get(key).map(|v| {
+            bincode::deserialize(v.as_ref()).expect("deserialize ChannelActorState should be OK")
+        })
+    }
+
+    fn insert_channel_actor_state(&self, state: ChannelActorState) {
+        let mut batch = self.batch();
+        batch.put_kv(KeyValue::ChannelActorState(state.id.clone(), state.clone()));
+        batch.put_kv(KeyValue::PeerIdChannelId(
+            (state.peer_id, state.id),
+            state.state,
+        ));
+        batch.commit();
+    }
+
+    fn get_channels(&self, peer_id: &tentacle::secio::PeerId) -> Vec<Hash256> {
+        let prefix = [&[64], peer_id.as_bytes()].concat();
+        let iter = self.db.prefix_iterator(prefix.as_ref());
+        iter.map(|(key, _)| {
+            let channel_id: [u8; 32] = key[prefix.len()..]
+                .try_into()
+                .expect("channel id should be 32 bytes");
+            channel_id.into()
+        })
+        .collect()
+    }
+}
+
+impl InvoiceStore for Store {
+    fn get_invoice(&self, id: &Hash256) -> Option<CkbInvoice> {
+        let mut key = Vec::with_capacity(33);
+        key.extend_from_slice(&[32]);
+        key.extend_from_slice(id.as_ref());
+
+        self.get(key)
+            .map(|v| bincode::deserialize(v.as_ref()).expect("deserialize CkbInvoice should be OK"))
+    }
+
+    fn insert_invoice(&self, invoice: CkbInvoice) {
+        let mut batch = self.batch();
+        batch.put_kv(KeyValue::CkbInvoice(invoice.hash().into(), invoice));
+        batch.commit();
+    }
+}
diff --git a/tests/bruno/e2e/3-nodes-transfer/11-node3-gen-invoice.bru b/tests/bruno/e2e/3-nodes-transfer/11-node3-gen-invoice.bru
index 192de870..79d793bd 100644
--- a/tests/bruno/e2e/3-nodes-transfer/11-node3-gen-invoice.bru
+++ b/tests/bruno/e2e/3-nodes-transfer/11-node3-gen-invoice.bru
@@ -42,4 +42,7 @@ script:post-response {
   console.log("generate invoice: ", res.body.encode_payment);
   console.log("generated result: ", res.body);
 }
+<<<<<<< HEAD
 
+=======
+>>>>>>> f1fde85 (parent 63b234516064ce2480c4a2c238a20bcad255840e)
diff --git a/tests/deploy/run-dev-node.sh b/tests/deploy/run-dev-node.sh
new file mode 100755
index 00000000..c9ff6f10
--- /dev/null
+++ b/tests/deploy/run-dev-node.sh
@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+script_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
+data_dir="$script_dir/node-data"
+
+# If -f is used, we will remove old state data. Otherwise we will skip the initialization.
+
+while getopts "f" opt; do
+    case $opt in
+    f)
+        # TODO: this is a linux only command.
+        for pid in $(pgrep "^ckb$"); do
+            # grep with exact match
+            if grep -Fq "$data_dir" "/proc/$pid/cmdline"; then
+                kill "$pid"
+            fi
+        done
+        rm -rf "$data_dir"
+        ;;
+    \?)
+        echo "Invalid option: $OPTARG" 1>&2
+        ;;
+    esac
+done
+
+if ! [[ -d "$data_dir" ]]; then
+    ckb init -C "$data_dir" -c dev --force --ba-arg 0xc8328aabcd9b9e8e64fbc566c4385c3bdeb219d7
+    # Enable the IntegrationTest module (required to generate blocks).
+    if ! grep -E '^modules.*IntegrationTest' "$data_dir/ckb.toml"; then
+        sed -i.bak 's/\("Debug"\)/\1, "IntegrationTest"/' "$data_dir"/ckb.toml
+    fi
+fi
+
+# Transfer some money from the default account (node 3) to node 1 and node 2 for later use.
+(
+    echo "begin to setup wallet states for nodes"
+    sleep 10
+    ckb-cli wallet transfer --to-address ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqgx5lf4pczpamsfam48evs0c8nvwqqa59qapt46f --capacity 5000000000 --fee-rate 2000 --privkey-path "$script_dir/../nodes/3/ckb-chain/key"
+    sleep 1
+    "$script_dir/generate-blocks.sh" 6
+    sleep 1
+
+    ckb-cli wallet transfer --to-address ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqt4vqqyehpxn47deg5l6eeqtkfrt5kfkfchkwv62 --capacity 5000000000 --fee-rate 2000 --privkey-path "$script_dir/../nodes/3/ckb-chain/key"
+    sleep 1
+    # Generate a few blocks so that above transaction is confirmed.
+    echo "begin to generate blocks for wallet updating..."
+    "$script_dir/generate-blocks.sh" 6
+)&
+
+ckb run -C "$data_dir" --indexer
\ No newline at end of file

From 3a24bbe5bd48537d54eda4b7688c51aa3f65c169 Mon Sep 17 00:00:00 2001
From: quake <quake.wang@gmail.com>
Date: Mon, 27 May 2024 17:35:46 +0900
Subject: [PATCH 2/5] chore: rebase

---
 Cargo.lock                                    | 10 ++++
 Cargo.toml                                    |  1 +
 src/ckb/channel.rs                            | 19 +++++--
 src/ckb/config.rs                             |  8 +++
 src/ckb/network.rs                            | 53 ++++++++++-------
 src/ckb/test_utils.rs                         | 14 ++++-
 src/invoice/invoice_impl.rs                   |  4 --
 src/invoice/invoices_db.rs                    | 22 -------
 src/invoice/mod.rs                            |  4 +-
 src/invoice/service.rs                        | 18 +++---
 src/invoice/store.rs                          |  6 ++
 src/lib.rs                                    |  2 +-
 src/main.rs                                   |  5 ++
 src/storage.rs                                | 57 -------------------
 src/store.rs                                  |  5 +-
 .../3-nodes-transfer/11-node3-gen-invoice.bru |  4 --
 16 files changed, 105 insertions(+), 127 deletions(-)
 delete mode 100644 src/invoice/invoices_db.rs
 create mode 100644 src/invoice/store.rs
 delete mode 100644 src/storage.rs

diff --git a/Cargo.lock b/Cargo.lock
index 2d8c3788..15a22ba1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -261,6 +261,15 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445"
 
+[[package]]
+name = "bincode"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "bindgen"
 version = "0.68.1"
@@ -774,6 +783,7 @@ dependencies = [
  "axum",
  "base64 0.13.1",
  "bech32 0.8.1",
+ "bincode",
  "bitcoin",
  "bitcoin-bech32",
  "bitflags 2.5.0",
diff --git a/Cargo.toml b/Cargo.toml
index beb23123..214afefe 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -43,6 +43,7 @@ thiserror = "1.0.58"
 anyhow = "1.0.81"
 env_logger = "0.11.3"
 tentacle = { git = "https://github.com/nervosnetwork/tentacle", branch = "bump-to-0.6.0" }
+bincode = "1.3.3"
 log = "0.4.21"
 futures = "0.3.30"
 once_cell = "1.19.0"
diff --git a/src/ckb/channel.rs b/src/ckb/channel.rs
index 948d7936..dfc4d63c 100644
--- a/src/ckb/channel.rs
+++ b/src/ckb/channel.rs
@@ -157,14 +157,19 @@ pub enum ChannelInitializationParameter {
 }
 
 #[derive(Debug)]
-pub struct ChannelActor {
+pub struct ChannelActor<S> {
     peer_id: PeerId,
     network: ActorRef<NetworkActorMessage>,
+    store: S,
 }
 
-impl ChannelActor {
-    pub fn new(peer_id: PeerId, network: ActorRef<NetworkActorMessage>) -> Self {
-        Self { peer_id, network }
+impl<S> ChannelActor<S> {
+    pub fn new(peer_id: PeerId, network: ActorRef<NetworkActorMessage>, store: S) -> Self {
+        Self {
+            peer_id,
+            network,
+            store,
+        }
     }
 
     pub fn handle_commitment_signed_command(
@@ -543,7 +548,10 @@ impl ChannelActor {
 }
 
 #[rasync_trait]
-impl Actor for ChannelActor {
+impl<S> Actor for ChannelActor<S>
+where
+    S: ChannelActorStateStore + Send + Sync + 'static,
+{
     type Msg = ChannelActorMessage;
     type State = ChannelActorState;
     type Arguments = ChannelInitializationParameter;
@@ -859,6 +867,7 @@ pub struct ChannelActorState {
     #[serde_as(as = "DisplayFromStr")]
     pub peer_id: PeerId,
     pub id: Hash256,
+    #[serde_as(as = "Option<EntityHex>")]
     pub funding_tx: Option<Transaction>,
 
     // Is this channel initially inbound?
diff --git a/src/ckb/config.rs b/src/ckb/config.rs
index cf7260dd..c5f31724 100644
--- a/src/ckb/config.rs
+++ b/src/ckb/config.rs
@@ -88,4 +88,12 @@ impl CkbConfig {
         self.create_base_dir()?;
         super::key::KeyPair::read_or_generate(&self.base_dir().join("sk")).map_err(Into::into)
     }
+
+    pub fn store_path(&self) -> PathBuf {
+        let path = self.base_dir().join("store");
+        if !path.exists() {
+            fs::create_dir_all(&path).expect("create store directory");
+        }
+        path
+    }
 }
diff --git a/src/ckb/network.rs b/src/ckb/network.rs
index b5b13016..c03cf1aa 100644
--- a/src/ckb/network.rs
+++ b/src/ckb/network.rs
@@ -33,8 +33,8 @@ use tokio::sync::{mpsc, oneshot};
 use tokio_util::task::TaskTracker;
 
 use super::channel::{
-    ChannelActorMessage, ChannelCommandWithId, ChannelEvent, ProcessingChannelError,
-    ProcessingChannelResult,
+    ChannelActorMessage, ChannelActorStateStore, ChannelCommandWithId, ChannelEvent,
+    ProcessingChannelError, ProcessingChannelResult,
 };
 use super::key::blake2b_hash_with_salt;
 use super::types::{Hash256, OpenChannel};
@@ -218,20 +218,26 @@ pub struct PCNMessageWithChannelId {
     pub message: PCNMessage,
 }
 
-pub struct NetworkActor {
+pub struct NetworkActor<S> {
     // An event emitter to notify ourside observers.
     event_sender: mpsc::Sender<NetworkServiceEvent>,
     chain_actor: ActorRef<CkbChainMessage>,
+    store: S,
 }
 
-impl NetworkActor {
+impl<S> NetworkActor<S>
+where
+    S: ChannelActorStateStore + Clone + Send + Sync + 'static,
+{
     pub fn new(
         event_sender: mpsc::Sender<NetworkServiceEvent>,
         chain_actor: ActorRef<CkbChainMessage>,
+        store: S,
     ) -> Self {
         Self {
             event_sender,
             chain_actor,
+            store,
         }
     }
 
@@ -326,18 +332,21 @@ impl NetworkActor {
             }
 
             NetworkActorCommand::OpenChannel(open_channel, reply) => {
-                let (_, channel_id) = state.create_outbound_channel(open_channel).await?;
+                let (_, channel_id) = state
+                    .create_outbound_channel(open_channel, self.store.clone())
+                    .await?;
                 if let Some(reply) = reply {
                     let _ = reply.send(Ok(OpenChannelResponse { channel_id }));
                 }
             }
             NetworkActorCommand::AcceptChannel(accept_channel, reply) => {
-                let result = state.create_inbound_channel(accept_channel).await.map(
-                    |(_, old_id, new_id)| AcceptChannelResponse {
+                let result = state
+                    .create_inbound_channel(accept_channel, self.store.clone())
+                    .await
+                    .map(|(_, old_id, new_id)| AcceptChannelResponse {
                         old_channel_id: old_id,
                         new_channel_id: new_id,
-                    },
-                );
+                    });
                 debug!("Processed accept channel command, result: {:?}", &result);
                 if let Some(reply) = reply {
                     let _ = reply.send(result.as_ref().map_err(Into::into).map(Clone::clone));
@@ -534,9 +543,10 @@ impl NetworkActorState {
         result
     }
 
-    pub async fn create_outbound_channel(
+    pub async fn create_outbound_channel<S: ChannelActorStateStore + Sync + Send + 'static>(
         &mut self,
         open_channel: OpenChannelCommand,
+        store: S,
     ) -> Result<(ActorRef<ChannelActorMessage>, Hash256), ProcessingChannelError> {
         let network = self.network.clone();
         let OpenChannelCommand {
@@ -547,7 +557,7 @@ impl NetworkActorState {
         let (tx, rx) = oneshot::channel::<Hash256>();
         let channel = Actor::spawn_linked(
             None,
-            ChannelActor::new(peer_id.clone(), network.clone()),
+            ChannelActor::new(peer_id.clone(), network.clone(), store),
             ChannelInitializationParameter::OpenChannel(funding_amount, seed, tx),
             network.clone().get_cell(),
         )
@@ -557,9 +567,10 @@ impl NetworkActorState {
         Ok((channel, temp_channel_id))
     }
 
-    pub async fn create_inbound_channel(
+    pub async fn create_inbound_channel<S: ChannelActorStateStore + Sync + Send + 'static>(
         &mut self,
         accept_channel: AcceptChannelCommand,
+        store: S,
     ) -> Result<(ActorRef<ChannelActorMessage>, Hash256, Hash256), ProcessingChannelError> {
         let AcceptChannelCommand {
             temp_channel_id,
@@ -583,7 +594,7 @@ impl NetworkActorState {
         let (tx, rx) = oneshot::channel::<Hash256>();
         let channel = Actor::spawn_linked(
             None,
-            ChannelActor::new(peer_id.clone(), network.clone()),
+            ChannelActor::new(peer_id.clone(), network.clone(), store),
             ChannelInitializationParameter::AcceptChannel(
                 funding_amount,
                 seed,
@@ -638,11 +649,6 @@ impl NetworkActorState {
         }
     }
 
-<<<<<<< HEAD
-    fn on_peer_connected(&mut self, id: &PeerId, session: &SessionContext) {
-        debug!("Peer connected: {:?}, session id: {}", &id, session.id);
-        self.peer_session_map.insert(id.clone(), session.id);
-=======
     async fn on_peer_connected<S: ChannelActorStateStore + Clone + Send + Sync + 'static>(
         &mut self,
         peer_id: &PeerId,
@@ -665,7 +671,6 @@ impl NetworkActorState {
                 self.on_channel_created(channel_id, peer_id, channel);
             }
         }
->>>>>>> f1fde85 (parent 63b234516064ce2480c4a2c238a20bcad255840e)
     }
 
     fn on_peer_disconnected(&mut self, id: &PeerId, session: &SessionContext) {
@@ -834,7 +839,10 @@ impl NetworkActorState {
 }
 
 #[rasync_trait]
-impl Actor for NetworkActor {
+impl<S> Actor for NetworkActor<S>
+where
+    S: ChannelActorStateStore + Clone + Send + Sync + 'static,
+{
     type Msg = NetworkActorMessage;
     type State = NetworkActorState;
     type Arguments = (CkbConfig, TaskTracker);
@@ -1195,16 +1203,17 @@ impl ServiceHandle for Handle {
     }
 }
 
-pub async fn start_ckb(
+pub async fn start_ckb<S: ChannelActorStateStore + Clone + Send + Sync + 'static>(
     config: CkbConfig,
     chain_actor: ActorRef<CkbChainMessage>,
     event_sender: mpsc::Sender<NetworkServiceEvent>,
     tracker: TaskTracker,
     root_actor: ActorCell,
+    store: S,
 ) -> ActorRef<NetworkActorMessage> {
     let (actor, _handle) = Actor::spawn_linked(
         Some("network actor".to_string()),
-        NetworkActor::new(event_sender, chain_actor),
+        NetworkActor::new(event_sender, chain_actor, store),
         (config, tracker),
         root_actor,
     )
diff --git a/src/ckb/test_utils.rs b/src/ckb/test_utils.rs
index f50a8cc9..e89f0a19 100644
--- a/src/ckb/test_utils.rs
+++ b/src/ckb/test_utils.rs
@@ -1,8 +1,10 @@
 use std::{
+    collections::HashMap,
     env,
     ffi::OsStr,
     mem::ManuallyDrop,
     path::{Path, PathBuf},
+    sync::{Arc, RwLock},
     time::Duration,
 };
 
@@ -23,7 +25,11 @@ use crate::{
     CkbConfig, NetworkServiceEvent,
 };
 
-use super::{NetworkActor, NetworkActorCommand, NetworkActorMessage};
+use super::{
+    channel::{ChannelActorState, ChannelActorStateStore},
+    types::Hash256,
+    NetworkActor, NetworkActorCommand, NetworkActorMessage,
+};
 
 static RETAIN_VAR: &str = "TEST_TEMP_RETAIN";
 
@@ -108,7 +114,11 @@ impl NetworkNode {
 
         let network_actor = Actor::spawn_linked(
             Some(format!("network actor at {:?}", base_dir.as_ref())),
-            NetworkActor::new(event_sender, noop_chain_actor.clone()),
+            NetworkActor::new(
+                event_sender,
+                noop_chain_actor.clone(),
+                MemoryStore::default(),
+            ),
             (ckb_config, new_tokio_task_tracker()),
             root.get_cell(),
         )
diff --git a/src/invoice/invoice_impl.rs b/src/invoice/invoice_impl.rs
index a0ab39e0..c3c9ab12 100644
--- a/src/invoice/invoice_impl.rs
+++ b/src/invoice/invoice_impl.rs
@@ -1,11 +1,7 @@
 use super::errors::VerificationError;
 use super::utils::*;
 use crate::ckb::gen::invoice::{self as gen_invoice, *};
-<<<<<<< HEAD
-use crate::ckb::serde_utils::EntityWrapperBase64;
-=======
 use crate::ckb::serde_utils::EntityHex;
->>>>>>> f1fde85 (parent 63b234516064ce2480c4a2c238a20bcad255840e)
 use crate::ckb::types::Hash256;
 use crate::invoice::InvoiceError;
 use bech32::{encode, u5, FromBase32, ToBase32, Variant, WriteBase32};
diff --git a/src/invoice/invoices_db.rs b/src/invoice/invoices_db.rs
deleted file mode 100644
index 4c583d80..00000000
--- a/src/invoice/invoices_db.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-use crate::{ckb::types::Hash256, invoice::CkbInvoice};
-use std::collections::HashMap;
-
-use super::InvoiceError;
-
-// TODO: persist generated invoices
-#[derive(Default)]
-pub struct InvoicesDb {
-    invoices: HashMap<Hash256, CkbInvoice>,
-}
-
-impl InvoicesDb {
-    pub fn insert_invoice(&mut self, invoice: CkbInvoice) -> Result<(), InvoiceError> {
-        if self.invoices.contains_key(&invoice.payment_hash()) {
-            return Err(InvoiceError::DuplicatedInvoice(
-                invoice.payment_hash().to_string(),
-            ));
-        }
-        self.invoices.insert(*invoice.payment_hash(), invoice);
-        Ok(())
-    }
-}
diff --git a/src/invoice/mod.rs b/src/invoice/mod.rs
index b46f6a11..010df697 100644
--- a/src/invoice/mod.rs
+++ b/src/invoice/mod.rs
@@ -1,12 +1,12 @@
 mod command;
 mod errors;
 mod invoice_impl;
-mod invoices_db;
 mod service;
+mod store;
 mod utils;
 
 pub use command::*;
 pub use errors::InvoiceError;
 pub use invoice_impl::{CkbInvoice, InvoiceBuilder, InvoiceSignature};
-pub use invoices_db::*;
 pub use service::*;
+pub use store::*;
diff --git a/src/invoice/service.rs b/src/invoice/service.rs
index e59d0240..9d6e7809 100644
--- a/src/invoice/service.rs
+++ b/src/invoice/service.rs
@@ -1,4 +1,4 @@
-use super::{InvoiceCommand, InvoicesDb, NewInvoiceParams};
+use super::{InvoiceCommand, InvoiceStore, NewInvoiceParams};
 use crate::{invoice::*, rpc::InvoiceCommandWithReply};
 use anyhow::Result;
 use serde_json::json;
@@ -6,27 +6,31 @@ use std::time::Duration;
 use tokio::{select, sync::mpsc};
 use tokio_util::{sync::CancellationToken, task::TaskTracker};
 
-pub async fn start_invoice(
+pub async fn start_invoice<S: InvoiceStore + Send + 'static>(
     command_receiver: mpsc::Receiver<InvoiceCommandWithReply>,
     token: CancellationToken,
     tracker: TaskTracker,
+    store: S,
 ) {
     let service = InvoiceService {
         command_receiver,
         token,
-        invoices_db: Default::default(),
+        store,
     };
     tracker.spawn(async move {
         service.run().await;
     });
 }
-struct InvoiceService {
+struct InvoiceService<S> {
     token: CancellationToken,
     command_receiver: mpsc::Receiver<InvoiceCommandWithReply>,
-    invoices_db: InvoicesDb,
+    store: S,
 }
 
-impl InvoiceService {
+impl<S> InvoiceService<S>
+where
+    S: InvoiceStore,
+{
     pub async fn run(mut self) {
         loop {
             select! {
@@ -113,7 +117,7 @@ impl InvoiceService {
 
         let invoice = invoice_builder.build();
         if let Ok(invoice) = &invoice {
-            self.invoices_db.insert_invoice(invoice.clone())?;
+            self.store.insert_invoice(invoice.clone());
         }
         invoice
     }
diff --git a/src/invoice/store.rs b/src/invoice/store.rs
new file mode 100644
index 00000000..7cfc9ea0
--- /dev/null
+++ b/src/invoice/store.rs
@@ -0,0 +1,6 @@
+use crate::{ckb::types::Hash256, invoice::CkbInvoice};
+
+pub trait InvoiceStore {
+    fn get_invoice(&self, id: &Hash256) -> Option<CkbInvoice>;
+    fn insert_invoice(&self, invoice: CkbInvoice);
+}
diff --git a/src/lib.rs b/src/lib.rs
index 0c8027d1..39c20c0e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -13,7 +13,7 @@ pub use cch::{start_cch, CchConfig};
 pub mod rpc;
 pub use rpc::{start_rpc, RpcConfig, RpcError};
 pub mod invoice;
-pub mod storage;
+pub mod store;
 
 mod errors;
 pub use errors::{Error, Result};
diff --git a/src/main.rs b/src/main.rs
index 00b8a530..49c734bc 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,6 +2,7 @@ use ckb_pcn_node::ckb::chain::CommitmentLockContext;
 use ckb_pcn_node::ckb::config::CkbNetwork;
 use ckb_pcn_node::invoice::start_invoice;
 use ckb_pcn_node::rpc::InvoiceCommandWithReply;
+use ckb_pcn_node::store::Store;
 use log::{debug, error, info};
 use ractor::Actor;
 use tentacle::multiaddr::Multiaddr;
@@ -43,6 +44,8 @@ pub async fn main() {
     let token = new_tokio_cancellation_token();
     let root_actor = RootActor::start(tracker, token).await;
 
+    let store = Store::new(config.ckb.as_ref().unwrap().store_path());
+
     let ckb_command_sender = match config.ckb {
         Some(ckb_config) => {
             // TODO: this is not a super user friendly error message which has actionable information
@@ -74,6 +77,7 @@ pub async fn main() {
                 event_sender,
                 new_tokio_task_tracker(),
                 root_actor.get_cell(),
+                store.clone(),
             )
             .await;
 
@@ -140,6 +144,7 @@ pub async fn main() {
             command_receiver,
             new_tokio_cancellation_token(),
             new_tokio_task_tracker(),
+            store,
         )
         .await;
         Some(command_sender)
diff --git a/src/storage.rs b/src/storage.rs
deleted file mode 100644
index cddf7d2e..00000000
--- a/src/storage.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-use std::{
-    collections::{HashMap, HashSet},
-    path::Path,
-    sync::Arc,
-};
-
-use rocksdb::{prelude::*, Direction, IteratorMode, WriteBatch, DB};
-
-#[derive(Clone)]
-pub struct Storage {
-    pub(crate) db: Arc<DB>,
-}
-
-impl Storage {
-    pub fn new<P: AsRef<Path>>(path: P) -> Self {
-        let db = Arc::new(DB::open_default(path).expect("Failed to open rocksdb"));
-        Self { db }
-    }
-
-    fn get<K: AsRef<[u8]>>(&self, key: K) -> Result<Option<Vec<u8>>, Error> {
-        self.db.get(key.as_ref()).map(|v| v.map(|vi| vi.to_vec()))
-    }
-
-    fn batch(&self) -> Batch {
-        Batch {
-            db: Arc::clone(&self.db),
-            wb: WriteBatch::default(),
-        }
-    }
-}
-
-pub struct Batch {
-    db: Arc<DB>,
-    wb: WriteBatch,
-}
-
-impl Batch {
-    fn put_kv<K: Into<Vec<u8>>, V: Into<Vec<u8>>>(
-        &mut self,
-        key: K,
-        value: V,
-    ) -> Result<(), Error> {
-        self.put(&Into::<Vec<u8>>::into(key), &Into::<Vec<u8>>::into(value))
-    }
-
-    fn put<K: AsRef<[u8]>, V: AsRef<[u8]>>(&mut self, key: K, value: V) -> Result<(), Error> {
-        self.wb.put(key, value)
-    }
-
-    fn delete<K: AsRef<[u8]>>(&mut self, key: K) -> Result<(), Error> {
-        self.wb.delete(key.as_ref())
-    }
-
-    fn commit(self) -> Result<(), Error> {
-        self.db.write(&self.wb)
-    }
-}
diff --git a/src/store.rs b/src/store.rs
index 987e776a..0564b914 100644
--- a/src/store.rs
+++ b/src/store.rs
@@ -146,7 +146,10 @@ impl InvoiceStore for Store {
 
     fn insert_invoice(&self, invoice: CkbInvoice) {
         let mut batch = self.batch();
-        batch.put_kv(KeyValue::CkbInvoice(invoice.hash().into(), invoice));
+        batch.put_kv(KeyValue::CkbInvoice(
+            invoice.payment_hash().clone(),
+            invoice,
+        ));
         batch.commit();
     }
 }
diff --git a/tests/bruno/e2e/3-nodes-transfer/11-node3-gen-invoice.bru b/tests/bruno/e2e/3-nodes-transfer/11-node3-gen-invoice.bru
index 79d793bd..64397c3f 100644
--- a/tests/bruno/e2e/3-nodes-transfer/11-node3-gen-invoice.bru
+++ b/tests/bruno/e2e/3-nodes-transfer/11-node3-gen-invoice.bru
@@ -42,7 +42,3 @@ script:post-response {
   console.log("generate invoice: ", res.body.encode_payment);
   console.log("generated result: ", res.body);
 }
-<<<<<<< HEAD
-
-=======
->>>>>>> f1fde85 (parent 63b234516064ce2480c4a2c238a20bcad255840e)

From 511362b62a1df88a4f55a112a618353b6e9c789e Mon Sep 17 00:00:00 2001
From: quake <quake.wang@gmail.com>
Date: Mon, 27 May 2024 18:02:33 +0900
Subject: [PATCH 3/5] chore: try fix mock

---
 .github/workflows/ci.yml     |  4 +--
 src/ckb/test_utils.rs        |  2 ++
 tests/deploy/run-dev-node.sh | 52 ------------------------------------
 3 files changed, 4 insertions(+), 54 deletions(-)
 delete mode 100755 tests/deploy/run-dev-node.sh

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 51047408..cb1b1713 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: Swatinem/rust-cache@v2
       - uses: dsherret/rust-toolchain-file@v1
-      - run: cargo test
+      - run: TESTING_CONTRACTS_DIR=./tests/deploy/contracts cargo test
 
   fmt:
     name: Rustfmt
@@ -40,6 +40,6 @@ jobs:
       - run: |
           # The files generated by molecule is causing clippy to fail.
           # We ignore the clippy check for now.
-          if ! cargo clippy -- -D warnings; then 
+          if ! cargo clippy -- -D warnings; then
             :
           fi
diff --git a/src/ckb/test_utils.rs b/src/ckb/test_utils.rs
index e89f0a19..449883d3 100644
--- a/src/ckb/test_utils.rs
+++ b/src/ckb/test_utils.rs
@@ -20,6 +20,7 @@ use tokio::{
 
 use crate::{
     actors::{RootActor, RootActorMessage},
+    ckb::{chain::CommitmentLockContext, config::CkbNetwork},
     ckb_chain::MockChainActor,
     tasks::{new_tokio_cancellation_token, new_tokio_task_tracker},
     CkbConfig, NetworkServiceEvent,
@@ -101,6 +102,7 @@ impl NetworkNode {
             ..Default::default()
         };
 
+        CommitmentLockContext::initialize(CkbNetwork::Mocknet);
         let root = ROOT_ACTOR.get_or_init(get_test_root_actor).await.clone();
         let (event_sender, mut event_receiver) = mpsc::channel(10000);
 
diff --git a/tests/deploy/run-dev-node.sh b/tests/deploy/run-dev-node.sh
deleted file mode 100755
index c9ff6f10..00000000
--- a/tests/deploy/run-dev-node.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-script_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
-data_dir="$script_dir/node-data"
-
-# If -f is used, we will remove old state data. Otherwise we will skip the initialization.
-
-while getopts "f" opt; do
-    case $opt in
-    f)
-        # TODO: this is a linux only command.
-        for pid in $(pgrep "^ckb$"); do
-            # grep with exact match
-            if grep -Fq "$data_dir" "/proc/$pid/cmdline"; then
-                kill "$pid"
-            fi
-        done
-        rm -rf "$data_dir"
-        ;;
-    \?)
-        echo "Invalid option: $OPTARG" 1>&2
-        ;;
-    esac
-done
-
-if ! [[ -d "$data_dir" ]]; then
-    ckb init -C "$data_dir" -c dev --force --ba-arg 0xc8328aabcd9b9e8e64fbc566c4385c3bdeb219d7
-    # Enable the IntegrationTest module (required to generate blocks).
-    if ! grep -E '^modules.*IntegrationTest' "$data_dir/ckb.toml"; then
-        sed -i.bak 's/\("Debug"\)/\1, "IntegrationTest"/' "$data_dir"/ckb.toml
-    fi
-fi
-
-# Transfer some money from the default account (node 3) to node 1 and node 2 for later use.
-(
-    echo "begin to setup wallet states for nodes"
-    sleep 10
-    ckb-cli wallet transfer --to-address ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqgx5lf4pczpamsfam48evs0c8nvwqqa59qapt46f --capacity 5000000000 --fee-rate 2000 --privkey-path "$script_dir/../nodes/3/ckb-chain/key"
-    sleep 1
-    "$script_dir/generate-blocks.sh" 6
-    sleep 1
-
-    ckb-cli wallet transfer --to-address ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqt4vqqyehpxn47deg5l6eeqtkfrt5kfkfchkwv62 --capacity 5000000000 --fee-rate 2000 --privkey-path "$script_dir/../nodes/3/ckb-chain/key"
-    sleep 1
-    # Generate a few blocks so that above transaction is confirmed.
-    echo "begin to generate blocks for wallet updating..."
-    "$script_dir/generate-blocks.sh" 6
-)&
-
-ckb run -C "$data_dir" --indexer
\ No newline at end of file

From a844ad092700af191b50d1115549e54af251fd32 Mon Sep 17 00:00:00 2001
From: YI <uuuuuu@protonmail.com>
Date: Mon, 27 May 2024 22:37:22 +0800
Subject: [PATCH 4/5] Include contract binaries in testing environment

---
 .github/workflows/ci.yml |   2 +-
 src/ckb/chain.rs         | 116 ++++++++++++++++++++++++++++-----------
 2 files changed, 86 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cb1b1713..5842cc8e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: Swatinem/rust-cache@v2
       - uses: dsherret/rust-toolchain-file@v1
-      - run: TESTING_CONTRACTS_DIR=./tests/deploy/contracts cargo test
+      - run: cargo test
 
   fmt:
     name: Rustfmt
diff --git a/src/ckb/chain.rs b/src/ckb/chain.rs
index 7354d985..35f42191 100644
--- a/src/ckb/chain.rs
+++ b/src/ckb/chain.rs
@@ -4,30 +4,24 @@ use ckb_types::{
     packed::{CellDep, CellDepVec, OutPoint, Script},
     prelude::{Builder, Entity, PackVec},
 };
-use log::{debug, warn};
+use log::debug;
 use once_cell::sync::OnceCell;
 use std::{
     collections::HashMap,
+    env,
     str::FromStr,
     sync::{Arc, RwLock, RwLockReadGuard, RwLockWriteGuard},
 };
-use std::{env, fs, path::PathBuf};
 
 use ckb_types::prelude::Pack;
 
 use super::{config::CkbNetwork, types::Hash256};
 
-fn load_contract_binary(base_dir: &str, contract: Contract) -> Bytes {
-    let mut path = PathBuf::from(base_dir);
-    path.push(PathBuf::from(contract.binary_name()));
-
-    let result = fs::read(&path);
-    if result.is_err() {
-        panic!("Loading binary {:?} failed: {:?}", path, result.err());
-    }
-    result.unwrap().into()
-}
-
+// TODO: MockContext should only be used in tests.
+// We previously used MockContext with CommitmentLockContext::is_testing
+// to determine if we are in a testing environment. If we are in a testing environment,
+// we try to validate transactions with ckb_testtool.
+// We should eventually remove this and write unit tests to validate transactions.
 #[derive(Debug)]
 pub struct MockContext {
     context: RwLock<Context>,
@@ -35,6 +29,81 @@ pub struct MockContext {
 }
 
 impl MockContext {
+    // If we are using cfg(test), then directly including contracts binaries into the
+    // resulting executable is not a problem. Otherwise, we'd better read the binaries from
+    // the filesystem.
+    #[cfg(test)]
+    fn get_contract_binaries() -> Vec<(Contract, Bytes)> {
+        [
+            (
+                Contract::FundingLock,
+                Bytes::from_static(include_bytes!("../../tests/deploy/contracts/funding-lock")),
+            ),
+            (
+                Contract::CommitmentLock,
+                Bytes::from_static(include_bytes!(
+                    "../../tests/deploy/contracts/commitment-lock"
+                )),
+            ),
+            (
+                Contract::AlwaysSuccess,
+                Bytes::from_static(include_bytes!(
+                    "../../tests/deploy/contracts/always_success"
+                )),
+            ),
+            (
+                Contract::CkbAuth,
+                Bytes::from_static(include_bytes!("../../tests/deploy/contracts/auth")),
+            ),
+            (
+                Contract::SimpleUDT,
+                Bytes::from_static(include_bytes!("../../tests/deploy/contracts/simple_udt")),
+            ),
+        ]
+        .into()
+    }
+
+    #[cfg(not(test))]
+    fn get_contract_binaries() -> Vec<(Contract, Bytes)> {
+        use log::warn;
+        use std::{fs, path::PathBuf};
+
+        match env::var("TESTING_CONTRACTS_DIR") {
+            Ok(base_dir) => {
+                [
+                    (Contract::FundingLock, "funding-lock"),
+                    (Contract::CommitmentLock, "commitment-lock"),
+                    (Contract::AlwaysSuccess, "always_success"),
+                    // These are contracts that we will call from other contracts, e.g. funding-lock.
+                    (Contract::CkbAuth, "auth"),
+                    (Contract::SimpleUDT, "simple_udt"),
+                ]
+                .into_iter()
+                .map(|(contract, binary_name)| {
+                    let mut path = PathBuf::from(base_dir.clone());
+                    path.push(PathBuf::from(binary_name));
+
+                    let binary = fs::read(&path).expect(
+                        format!(
+                            "Failed to read contract binary from path: {:?}",
+                            path.as_path()
+                        )
+                        .as_str(),
+                    );
+                    (contract, binary.into())
+                })
+                .collect()
+            }
+            Err(e) => {
+                warn!(
+                    "TESTING_CONTRACTS_DIR is not set, using default contracts: {:?}",
+                    e
+                );
+                vec![]
+            }
+        }
+    }
+
     // This is used temporarily to test the functionality of the contract.
     pub fn get() -> &'static Self {
         static INSTANCE: OnceCell<MockContext> = OnceCell::new();
@@ -68,9 +137,9 @@ impl MockContext {
                         "TESTING_CONTRACTS_DIR is not set, using default contracts: {:?}",
                         e
                     );
-                    (HashMap::new(), vec![])
-                }
-            };
+                    (map, cell_deps)
+                },
+            );
             let cell_dep_vec = cell_deps.pack();
             debug!("Loaded contracts into the mock environement: {:?}", &map);
             debug!(
@@ -101,21 +170,6 @@ enum Contract {
     SimpleUDT,
 }
 
-impl Contract {
-    fn binary_name(&self) -> &'static str {
-        match self {
-            Contract::FundingLock => "funding-lock",
-            Contract::CommitmentLock => "commitment-lock",
-            // TODO fix me.
-            // We create an secp256k1 binary here because we need to find out the tx of secp256k1 in dev chain.
-            Contract::Secp256k1Lock => "always_success",
-            Contract::AlwaysSuccess => "always_success",
-            Contract::CkbAuth => "auth",
-            Contract::SimpleUDT => "simple_udt",
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct ContractsContext {
     contract_default_scripts: HashMap<Contract, Script>,

From 93d4ce7385c88c3b77cf2e6972161150147376a5 Mon Sep 17 00:00:00 2001
From: quake <quake.wang@gmail.com>
Date: Wed, 29 May 2024 16:45:01 +0900
Subject: [PATCH 5/5] chore: rebase with main

---
 src/ckb/chain.rs      | 116 +++++++++++-------------------------------
 src/ckb/test_utils.rs |   2 -
 2 files changed, 31 insertions(+), 87 deletions(-)

diff --git a/src/ckb/chain.rs b/src/ckb/chain.rs
index 35f42191..7354d985 100644
--- a/src/ckb/chain.rs
+++ b/src/ckb/chain.rs
@@ -4,24 +4,30 @@ use ckb_types::{
     packed::{CellDep, CellDepVec, OutPoint, Script},
     prelude::{Builder, Entity, PackVec},
 };
-use log::debug;
+use log::{debug, warn};
 use once_cell::sync::OnceCell;
 use std::{
     collections::HashMap,
-    env,
     str::FromStr,
     sync::{Arc, RwLock, RwLockReadGuard, RwLockWriteGuard},
 };
+use std::{env, fs, path::PathBuf};
 
 use ckb_types::prelude::Pack;
 
 use super::{config::CkbNetwork, types::Hash256};
 
-// TODO: MockContext should only be used in tests.
-// We previously used MockContext with CommitmentLockContext::is_testing
-// to determine if we are in a testing environment. If we are in a testing environment,
-// we try to validate transactions with ckb_testtool.
-// We should eventually remove this and write unit tests to validate transactions.
+fn load_contract_binary(base_dir: &str, contract: Contract) -> Bytes {
+    let mut path = PathBuf::from(base_dir);
+    path.push(PathBuf::from(contract.binary_name()));
+
+    let result = fs::read(&path);
+    if result.is_err() {
+        panic!("Loading binary {:?} failed: {:?}", path, result.err());
+    }
+    result.unwrap().into()
+}
+
 #[derive(Debug)]
 pub struct MockContext {
     context: RwLock<Context>,
@@ -29,81 +35,6 @@ pub struct MockContext {
 }
 
 impl MockContext {
-    // If we are using cfg(test), then directly including contracts binaries into the
-    // resulting executable is not a problem. Otherwise, we'd better read the binaries from
-    // the filesystem.
-    #[cfg(test)]
-    fn get_contract_binaries() -> Vec<(Contract, Bytes)> {
-        [
-            (
-                Contract::FundingLock,
-                Bytes::from_static(include_bytes!("../../tests/deploy/contracts/funding-lock")),
-            ),
-            (
-                Contract::CommitmentLock,
-                Bytes::from_static(include_bytes!(
-                    "../../tests/deploy/contracts/commitment-lock"
-                )),
-            ),
-            (
-                Contract::AlwaysSuccess,
-                Bytes::from_static(include_bytes!(
-                    "../../tests/deploy/contracts/always_success"
-                )),
-            ),
-            (
-                Contract::CkbAuth,
-                Bytes::from_static(include_bytes!("../../tests/deploy/contracts/auth")),
-            ),
-            (
-                Contract::SimpleUDT,
-                Bytes::from_static(include_bytes!("../../tests/deploy/contracts/simple_udt")),
-            ),
-        ]
-        .into()
-    }
-
-    #[cfg(not(test))]
-    fn get_contract_binaries() -> Vec<(Contract, Bytes)> {
-        use log::warn;
-        use std::{fs, path::PathBuf};
-
-        match env::var("TESTING_CONTRACTS_DIR") {
-            Ok(base_dir) => {
-                [
-                    (Contract::FundingLock, "funding-lock"),
-                    (Contract::CommitmentLock, "commitment-lock"),
-                    (Contract::AlwaysSuccess, "always_success"),
-                    // These are contracts that we will call from other contracts, e.g. funding-lock.
-                    (Contract::CkbAuth, "auth"),
-                    (Contract::SimpleUDT, "simple_udt"),
-                ]
-                .into_iter()
-                .map(|(contract, binary_name)| {
-                    let mut path = PathBuf::from(base_dir.clone());
-                    path.push(PathBuf::from(binary_name));
-
-                    let binary = fs::read(&path).expect(
-                        format!(
-                            "Failed to read contract binary from path: {:?}",
-                            path.as_path()
-                        )
-                        .as_str(),
-                    );
-                    (contract, binary.into())
-                })
-                .collect()
-            }
-            Err(e) => {
-                warn!(
-                    "TESTING_CONTRACTS_DIR is not set, using default contracts: {:?}",
-                    e
-                );
-                vec![]
-            }
-        }
-    }
-
     // This is used temporarily to test the functionality of the contract.
     pub fn get() -> &'static Self {
         static INSTANCE: OnceCell<MockContext> = OnceCell::new();
@@ -137,9 +68,9 @@ impl MockContext {
                         "TESTING_CONTRACTS_DIR is not set, using default contracts: {:?}",
                         e
                     );
-                    (map, cell_deps)
-                },
-            );
+                    (HashMap::new(), vec![])
+                }
+            };
             let cell_dep_vec = cell_deps.pack();
             debug!("Loaded contracts into the mock environement: {:?}", &map);
             debug!(
@@ -170,6 +101,21 @@ enum Contract {
     SimpleUDT,
 }
 
+impl Contract {
+    fn binary_name(&self) -> &'static str {
+        match self {
+            Contract::FundingLock => "funding-lock",
+            Contract::CommitmentLock => "commitment-lock",
+            // TODO fix me.
+            // We create an secp256k1 binary here because we need to find out the tx of secp256k1 in dev chain.
+            Contract::Secp256k1Lock => "always_success",
+            Contract::AlwaysSuccess => "always_success",
+            Contract::CkbAuth => "auth",
+            Contract::SimpleUDT => "simple_udt",
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct ContractsContext {
     contract_default_scripts: HashMap<Contract, Script>,
diff --git a/src/ckb/test_utils.rs b/src/ckb/test_utils.rs
index 449883d3..e89f0a19 100644
--- a/src/ckb/test_utils.rs
+++ b/src/ckb/test_utils.rs
@@ -20,7 +20,6 @@ use tokio::{
 
 use crate::{
     actors::{RootActor, RootActorMessage},
-    ckb::{chain::CommitmentLockContext, config::CkbNetwork},
     ckb_chain::MockChainActor,
     tasks::{new_tokio_cancellation_token, new_tokio_task_tracker},
     CkbConfig, NetworkServiceEvent,
@@ -102,7 +101,6 @@ impl NetworkNode {
             ..Default::default()
         };
 
-        CommitmentLockContext::initialize(CkbNetwork::Mocknet);
         let root = ROOT_ACTOR.get_or_init(get_test_root_actor).await.clone();
         let (event_sender, mut event_receiver) = mpsc::channel(10000);