chore: update ckb

synapseweb3 · Nov 1, 2023 · 3a607ad · 3a607ad
1 parent bb3561f
commit 3a607ad
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/ibc-test.yaml b/.github/workflows/ibc-test.yaml
@@ -64,10 +64,10 @@ jobs:
       - name: Prepare CKB
         run: |
           if [ ! -f "/tmp/ckb.tar.gz" ]; then
-            curl -L https://github.com/nervosnetwork/ckb/releases/download/v0.110.0/ckb_v0.110.0_x86_64-unknown-linux-gnu.tar.gz -o /tmp/ckb.tar.gz
+            curl -L https://github.com/nervosnetwork/ckb/releases/download/v0.111.0/ckb_v0.111.0_x86_64-unknown-linux-gnu.tar.gz -o /tmp/ckb.tar.gz
           fi
           tar -zxf /tmp/ckb.tar.gz -C /tmp
-          echo "/tmp/ckb_v0.110.0_x86_64-unknown-linux-gnu" >> $GITHUB_PATH
+          echo "/tmp/ckb_v0.111.0_x86_64-unknown-linux-gnu" >> $GITHUB_PATH
 
       - name: Prepare Axon source
         run: git clone --recursive https://github.com/axonweb3/axon.git $SRC_DIR/axon && cd $SRC_DIR/axon && git checkout $AXON_COMMIT

diff --git a/tools/forcerelay-test/ckb/dev.toml b/tools/forcerelay-test/ckb/dev.toml
@@ -9,7 +9,9 @@ uncles_hash = "0x000000000000000000000000000000000000000000000000000000000000000
 nonce = "0x0"
 
 [genesis.genesis_cell]
-message = "1675318506136"
+message = "ckb_dev" # {{
+# customize => message = "{genesis_message}"
+# }}
 
 [genesis.genesis_cell.lock]
 code_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"
@@ -75,21 +77,12 @@ lock.args = "0xc8328aabcd9b9e8e64fbc566c4385c3bdeb219d7"
 lock.hash_type = "type"
 
 # issue for random generated private key: 63d86723e08f0f813a36ce6aa123bb2289d90680ae1e99d4de8cdb334553f24d
-# it is used to deploy the contracts.
 [[genesis.issued_cells]]
 capacity = 5_198_735_037_00000000
 lock.code_hash = "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"
 lock.args = "0x470dcdc5e44064909650113a274b3b36aecb6dc7"
 lock.hash_type = "type"
 
-# issue for Relayer.
-# such walnut usual noble image raise cabin suspect combine key absurd detail present bless yard grief amazing slam brown donate fabric opera desk minor
-[[genesis.issued_cells]]
-capacity = 5_198_735_037_00000000
-lock.code_hash = "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"
-lock.args = "0x127e42bc1d301492246063521007ed3df10bc98c"
-lock.hash_type = "type"
-
 [params]
 initial_primary_epoch_reward = 1_917_808_21917808
 secondary_epoch_reward = 613_698_63013698
@@ -101,9 +94,11 @@ genesis_epoch_length = 1000
 # For development and testing purposes only.
 # Keep difficulty be permanent if the pow is Dummy. (default: false)
 permanent_difficulty_in_dummy = true
+starting_block_limiting_dao_withdrawing_lock = 0
 
 [params.hardfork]
 ckb2023 = 0
 
+
 [pow]
 func = "Dummy"
diff --git a/tools/forcerelay-test/src/lib.rs b/tools/forcerelay-test/src/lib.rs
@@ -114,6 +114,7 @@ mod tests {
                 .current_dir(&working_dir)
                 .status()
                 .unwrap();
+            println!("status: {:?}", res);
             assert!(res.success());
 
             sleep(60);

diff --git a/tools/ibc-test/README.md b/tools/ibc-test/README.md
@@ -43,9 +43,14 @@ export ACCOUNT_PREFIXES=ckb
 ## Axon
 export CHAIN_COMMAND_PATHS=axon
 export ACCOUNT_PREFIXES=axon
+## CKB, AXON
+export CHAIN_COMMAND_PATHS=ckb,axon
+export ACCOUNT_PREFIXES=ckb,axon
+## AXON, CKB
+export CHAIN_COMMAND_PATHS=axon,ckb
+export ACCOUNT_PREFIXES=axon,ckb
 ```
 
-
 Run tests:
 
 ``` bash