test: add more test

Author: driftluo

.github/workflows/ci.yaml

@@ -2,7 +2,7 @@ name: CI workflow
 
 on:
   pull_request:
-    types: [ opened, synchronize, reopened ]
+    types: [opened, synchronize, reopened]
   push:
     branches:
       - "develop"
@@ -18,63 +18,64 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-latest, macos-latest, windows-2019 ]
+        os: [ubuntu-latest, macos-latest, windows-2019]
     steps:
-    - uses: actions/checkout@v2
-    - if: matrix.os == 'windows-2019'
-      name: Windows Dependencies
-      run: |
-        iwr -useb get.scoop.sh -outfile 'install-scoop.ps1'
-        .\install-scoop.ps1 -RunAsAdmin
-        echo "LIBCLANG_PATH=$($HOME)/scoop/apps/llvm/current/bin" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-        echo "$env:USERPROFILE\scoop\shims" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-        scoop install llvm yasm
-    - name: UnitTest
-      run: make test
+      - uses: actions/checkout@v2
+      - if: matrix.os == 'windows-2019'
+        name: Windows Dependencies
+        run: |
+          iwr -useb get.scoop.sh -outfile 'install-scoop.ps1'
+          .\install-scoop.ps1 -RunAsAdmin
+          echo "LIBCLANG_PATH=$($HOME)/scoop/apps/llvm/current/bin" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          echo "$env:USERPROFILE\scoop\shims" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          scoop install llvm yasm
+      - name: UnitTest
+        run: make test
 
   build-examples:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-latest, macos-latest, windows-2019 ]
+        os: [ubuntu-latest, macos-latest, windows-2019]
     steps:
-    - uses: actions/checkout@v2
-    - if: matrix.os == 'windows-2019'
-      name: Windows Dependencies
-      run: |
-        iwr -useb get.scoop.sh -outfile 'install-scoop.ps1'
-        .\install-scoop.ps1 -RunAsAdmin
-        echo "LIBCLANG_PATH=$($HOME)/scoop/apps/llvm/current/bin" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-        echo "$env:USERPROFILE\scoop\shims" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-        scoop install llvm yasm
-    - name: Build Cargo Examples
-      run: cargo build --examples
+      - uses: actions/checkout@v2
+      - if: matrix.os == 'windows-2019'
+        name: Windows Dependencies
+        run: |
+          iwr -useb get.scoop.sh -outfile 'install-scoop.ps1'
+          .\install-scoop.ps1 -RunAsAdmin
+          echo "LIBCLANG_PATH=$($HOME)/scoop/apps/llvm/current/bin" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          echo "$env:USERPROFILE\scoop\shims" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          scoop install llvm yasm
+      - name: Build Cargo Examples
+        run: cargo build --examples
 
   linters:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
     steps:
-    - uses: actions/checkout@v2
-    - name: Linters
-      run: |
-        cargo fmt --version || rustup component add rustfmt
-        cargo clippy --version || rustup component add clippy
-        make fmt
-        make clippy
+      - uses: actions/checkout@v2
+      - name: Linters
+        run: |
+          cargo fmt --version || rustup component add rustfmt
+          cargo clippy --version || rustup component add clippy
+          make fmt
+          make clippy
 
   security-audit:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Security Audit & Licenses
-      run: |
-        rustup toolchain install stable --profile minimal
-        cargo deny --version || cargo install cargo-deny --locked
-        make security-audit
-        make check-crates
-        make check-licenses
+      - uses: actions/checkout@v2
+      - name: Security Audit & Licenses
+        run: |
+          rustup toolchain install stable --profile minimal
+          rm rust-toolchain.toml
+          cargo deny --version || cargo install cargo-deny --locked
+          make security-audit
+          make check-crates
+          make check-licenses
 
   ci-success:
     name: ci

Cargo.toml

@@ -55,7 +55,7 @@ sha3 = "0.10.1"
 enum-repr-derive = "0.2.0"
 
 # for feature test
-rand = { version = "0.7.3", optional = true }
+rand = { version = "0.7.3" }
 ckb-mock-tx-types = { version = "0.119.0" }
 ckb-chain-spec = "0.119.0"
 

deny.toml

@@ -74,7 +74,8 @@ ignore = [
     #{ id = "RUSTSEC-0000-0000", reason = "you can specify a reason the advisory is ignored" },
     #"[email protected]", # you can also ignore yanked crate versions if you wish
     #{ crate = "[email protected]", reason = "you can specify why you are ignoring the yanked crate" 
-    "RUSTSEC-2024-0370" # proc-macro-error's maintainer seems to be unreachable, ignore this
+    "RUSTSEC-2024-0370", # proc-macro-error's maintainer seems to be unreachable, ignore this
+    "RUSTSEC-2024-0384", # instant is no longer maintained, ignore this
 ]
 # If this is true, then cargo deny will use the git executable to fetch advisory database.
 # If this is false, then it uses a built-in git library.
@@ -97,7 +98,7 @@ allow = [
     "ISC",
     "MIT",
     "Unicode-DFS-2016",
-    "BSL-1.0", # xxhash-rust 0.8.10
+    "BSL-1.0",          # xxhash-rust 0.8.10
 
     #"MIT",
     #"Apache-2.0",

examples/omnilock_examples.rs

@@ -51,6 +51,7 @@ fn main() -> Result<(), Box<dyn StdErr>> {
         &SignContexts::new_omnilock(
             [secp256k1::SecretKey::from_slice(private_key.as_bytes())?].to_vec(),
             omni_cfg,
+            ckb_sdk::unlock::OmniUnlockMode::Normal,
         ),
     )?;
 

examples/omnilock_multisig_example.rs

@@ -62,6 +62,7 @@ fn main() -> Result<(), Box<dyn StdErr>> {
         &SignContexts::new_omnilock(
             [secp256k1::SecretKey::from_slice(private_key.as_bytes())?].to_vec(),
             omni_cfg.clone(),
+            ckb_sdk::unlock::OmniUnlockMode::Normal,
         ),
     )?;
     let private_key = h256!("0x4fd809631a6aa6e3bb378dd65eae5d71df895a82c91a615a1e8264741515c79c");
@@ -70,6 +71,7 @@ fn main() -> Result<(), Box<dyn StdErr>> {
         &SignContexts::new_omnilock(
             [secp256k1::SecretKey::from_slice(private_key.as_bytes())?].to_vec(),
             omni_cfg,
+            ckb_sdk::unlock::OmniUnlockMode::Normal,
         ),
     )?;
 

rust-toolchain

@@ -232,7 +232,8 @@ impl TransactionBuilder {
         if witness_data.is_empty() {
             WitnessArgs::default()
         } else {
-            WitnessArgs::from_slice(witness_data.as_ref()).unwrap()
+            WitnessArgs::from_slice(witness_data.as_ref())
+                .expect("WitnessArgs expected but failed to decode ")
         }
     }
 

src/core/advanced_builders.rs

@@ -5,21 +5,39 @@ mod tx_builder;
 
 use std::{collections::HashMap, u64};
 
+use ckb_dao_utils::pack_dao_data;
 use ckb_hash::blake2b_256;
 use ckb_jsonrpc_types as json_types;
 use ckb_types::{
     bytes::Bytes,
-    core::{BlockView, ScriptHashType},
+    core::{BlockView, Capacity, EpochNumberWithFraction, HeaderBuilder, ScriptHashType},
     h160, h256,
-    packed::{OutPoint, Script},
+    packed::{CellInput, CellOutput, OutPoint, Script, ScriptOpt, WitnessArgs},
     prelude::*,
     H160, H256,
 };
 
-use crate::constants::{DAO_TYPE_HASH, MULTISIG_TYPE_HASH, ONE_CKB, SIGHASH_TYPE_HASH};
+use crate::constants::{
+    CHEQUE_CELL_SINCE, DAO_TYPE_HASH, MULTISIG_TYPE_HASH, ONE_CKB, SIGHASH_TYPE_HASH,
+};
 use crate::traits::SecpCkbRawKeySigner;
-use crate::unlock::{MultisigConfig, OmniLockConfig, ScriptUnlocker, SecpMultisigUnlocker};
-use crate::ScriptId;
+use crate::tx_builder::{
+    acp::{AcpTransferBuilder, AcpTransferReceiver},
+    cheque::{ChequeClaimBuilder, ChequeWithdrawBuilder},
+    dao::{
+        DaoDepositBuilder, DaoDepositReceiver, DaoPrepareBuilder, DaoWithdrawBuilder,
+        DaoWithdrawItem, DaoWithdrawReceiver,
+    },
+    transfer::CapacityTransferBuilder,
+    udt::{UdtIssueBuilder, UdtTargetReceiver, UdtTransferBuilder, UdtType},
+    unlock_tx, CapacityBalancer, TransferAction, TxBuilder,
+};
+use crate::unlock::{
+    AcpUnlocker, ChequeAction, ChequeUnlocker, MultisigConfig, OmniLockConfig, ScriptUnlocker,
+    SecpMultisigUnlocker, SecpSighashUnlocker,
+};
+use crate::util::{calculate_dao_maximum_withdraw4, minimal_unlock_point};
+use crate::{ScriptId, Since, SinceType};
 
 use crate::test_util::{random_out_point, Context};
 
@@ -161,7 +179,7 @@ fn init_context(
 fn test_transfer_from_sighash() {
     let sender = build_sighash_script(ACCOUNT1_ARG);
     let receiver = build_sighash_script(ACCOUNT2_ARG);
-    let ctx = init_context(
+    let (ctx, _) = init_context(
         Vec::new(),
         vec![
             (sender.clone(), Some(100 * ONE_CKB)),
@@ -218,7 +236,7 @@ fn test_transfer_from_sighash() {
 fn test_transfer_capacity_overflow() {
     let sender = build_sighash_script(ACCOUNT1_ARG);
     let receiver = build_sighash_script(ACCOUNT2_ARG);
-    let ctx = init_context(Vec::new(), vec![(sender.clone(), Some(100 * ONE_CKB))]);
+    let (ctx, _) = init_context(Vec::new(), vec![(sender.clone(), Some(100 * ONE_CKB))]);
 
     let large_amount: u64 = u64::MAX;
     let output = CellOutput::new_builder()
@@ -251,7 +269,7 @@ fn test_transfer_from_multisig() {
     let sender = build_multisig_script(&cfg);
     let receiver = build_sighash_script(ACCOUNT2_ARG);
 
-    let ctx = init_context(
+    let (ctx, _) = init_context(
         Vec::new(),
         vec![
             (sender.clone(), Some(100 * ONE_CKB)),
@@ -315,7 +333,7 @@ fn test_transfer_from_acp() {
         .args(Bytes::from(ACCOUNT1_ARG.0.to_vec()).pack())
         .build();
     let receiver = build_sighash_script(ACCOUNT2_ARG);
-    let ctx = init_context(
+    let (ctx, _) = init_context(
         vec![(ACP_BIN, true)],
         vec![
             (sender.clone(), Some(100 * ONE_CKB)),
@@ -376,7 +394,7 @@ fn test_transfer_to_acp() {
         .hash_type(ScriptHashType::Data1.into())
         .args(Bytes::from(ACCOUNT2_ARG.0.to_vec()).pack())
         .build();
-    let ctx = init_context(
+    let (ctx, _) = init_context(
         vec![(ACP_BIN, true)],
         vec![
             (sender.clone(), Some(100 * ONE_CKB)),
@@ -462,7 +480,7 @@ fn test_cheque_claim() {
         .hash_type(ScriptHashType::Data1.into())
         .args(Bytes::from(vec![9u8; 32]).pack())
         .build();
-    let mut ctx = init_context(
+    let (mut ctx, _) = init_context(
         vec![(CHEQUE_BIN, true), (SUDT_BIN, false)],
         vec![
             (receiver.clone(), Some(100 * ONE_CKB)),
@@ -582,7 +600,7 @@ fn test_cheque_withdraw() {
         .hash_type(ScriptHashType::Data1.into())
         .args(Bytes::from(vec![9u8; 32]).pack())
         .build();
-    let mut ctx = init_context(
+    let (mut ctx, _) = init_context(
         vec![(CHEQUE_BIN, true), (SUDT_BIN, false)],
         vec![
             (sender.clone(), Some(100 * ONE_CKB)),
@@ -667,7 +685,7 @@ fn test_cheque_withdraw() {
 #[test]
 fn test_dao_deposit() {
     let sender = build_sighash_script(ACCOUNT1_ARG);
-    let ctx = init_context(
+    let (ctx, _) = init_context(
         Vec::new(),
         vec![
             (sender.clone(), Some(100 * ONE_CKB)),
@@ -732,7 +750,7 @@ fn test_dao_deposit() {
 #[test]
 fn test_dao_prepare() {
     let sender = build_sighash_script(ACCOUNT1_ARG);
-    let mut ctx = init_context(
+    let (mut ctx, _) = init_context(
         Vec::new(),
         vec![
             (sender.clone(), Some(100 * ONE_CKB)),
@@ -821,7 +839,7 @@ fn test_dao_prepare() {
 #[test]
 fn test_dao_withdraw() {
     let sender = build_sighash_script(ACCOUNT1_ARG);
-    let mut ctx = init_context(
+    let (mut ctx, _) = init_context(
         Vec::new(),
         vec![
             (sender.clone(), Some(100 * ONE_CKB)),
@@ -961,7 +979,7 @@ fn test_udt_issue() {
     let sudt_data_hash = H256::from(blake2b_256(SUDT_BIN));
     let owner = build_sighash_script(ACCOUNT1_ARG);
     let receiver = build_sighash_script(ACCOUNT2_ARG);
-    let ctx = init_context(
+    let (ctx, _) = init_context(
         vec![(SUDT_BIN, false)],
         vec![
             (owner.clone(), Some(100 * ONE_CKB)),
@@ -1055,7 +1073,7 @@ fn test_udt_transfer() {
         .hash_type(ScriptHashType::Data1.into())
         .args(owner.calc_script_hash().as_bytes().pack())
         .build();
-    let mut ctx = init_context(
+    let (mut ctx, _) = init_context(
         vec![(ACP_BIN, true), (SUDT_BIN, false)],
         vec![
             (sender.clone(), Some(100 * ONE_CKB)),
@@ -1142,10 +1160,3 @@ fn test_udt_transfer() {
     );
     ctx.verify(tx, FEE_RATE).unwrap();
 }
-
-pub mod ckb_indexer_rpc;
-pub mod ckb_rpc;
-pub mod cycle;
-pub mod omni_lock;
-pub mod omni_lock_util;
-pub mod transaction;