Merge pull request #826 from jjyr/merge-1.6-rc

Merge 1.6-rc

CHANGELOG.md

@@ -9,6 +9,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com).
 
 - Decouple block producing, submission and confirming [#776](https://github.com/nervosnetwork/godwoken/pull/776)
 
+## [v1.6.2] - 2022-10-25
+
+- Increase max return data [#822](https://github.com/godwokenrises/godwoken/pull/822)
+
+## [v1.6.1] - 2022-10-18
+
+- Add `fee_rate` option to block_producer config [#815](https://github.com/godwokenrises/godwoken/pull/815)
+
 ## [v1.6.0] - 2022-09-13
 
 

crates/block-producer/src/block_producer.rs

@@ -441,6 +441,7 @@ impl BlockProducer {
             &self.rpc_client.indexer,
             self.wallet.lock_script().to_owned(),
             local_cells_manager,
+            self.config.fee_rate,
         )
         .await?;
         debug_assert_eq!(

crates/block-producer/src/challenger.rs

@@ -249,7 +249,13 @@ impl Challenger {
         let challenger_lock_dep = self.ckb_genesis_info.sighash_dep();
         let challenger_lock = self.wallet.lock_script().to_owned();
         tx_skeleton.cell_deps_mut().push(challenger_lock_dep);
-        fill_tx_fee(&mut tx_skeleton, &self.rpc_client.indexer, challenger_lock).await?;
+        fill_tx_fee(
+            &mut tx_skeleton,
+            &self.rpc_client.indexer,
+            challenger_lock,
+            self.config.fee_rate,
+        )
+        .await?;
 
         let tx = self.wallet.sign_tx_skeleton(tx_skeleton)?;
 
@@ -498,7 +504,13 @@ impl Challenger {
         let challenger_lock_dep = self.ckb_genesis_info.sighash_dep();
         let challenger_lock = self.wallet.lock_script().to_owned();
         tx_skeleton.cell_deps_mut().push(challenger_lock_dep);
-        fill_tx_fee(&mut tx_skeleton, &self.rpc_client.indexer, challenger_lock).await?;
+        fill_tx_fee(
+            &mut tx_skeleton,
+            &self.rpc_client.indexer,
+            challenger_lock,
+            self.config.fee_rate,
+        )
+        .await?;
 
         let tx = self.wallet.sign_tx_skeleton(tx_skeleton)?;
 
@@ -535,7 +547,13 @@ impl Challenger {
         let challenger_lock_dep = self.ckb_genesis_info.sighash_dep();
         let challenger_lock = self.wallet.lock_script().to_owned();
         tx_skeleton.cell_deps_mut().push(challenger_lock_dep);
-        fill_tx_fee(&mut tx_skeleton, &self.rpc_client.indexer, challenger_lock).await?;
+        fill_tx_fee(
+            &mut tx_skeleton,
+            &self.rpc_client.indexer,
+            challenger_lock,
+            self.config.fee_rate,
+        )
+        .await?;
 
         self.wallet.sign_tx_skeleton(tx_skeleton)
     }
@@ -638,7 +656,13 @@ impl Challenger {
         }
 
         let owner_lock = self.wallet.lock_script().to_owned();
-        fill_tx_fee(&mut tx_skeleton, &self.rpc_client.indexer, owner_lock).await?;
+        fill_tx_fee(
+            &mut tx_skeleton,
+            &self.rpc_client.indexer,
+            owner_lock,
+            self.config.fee_rate,
+        )
+        .await?;
         self.wallet.sign_tx_skeleton(tx_skeleton)
     }
 

crates/block-producer/src/cleaner.rs

@@ -61,15 +61,22 @@ pub struct Cleaner {
     ckb_genesis_info: CKBGenesisInfo,
     wallet: Wallet,
     consumed_verifiers: ConsumedVerifiers,
+    fee_rate: u64,
 }
 
 impl Cleaner {
-    pub fn new(rpc_client: RPCClient, ckb_genesis_info: CKBGenesisInfo, wallet: Wallet) -> Self {
+    pub fn new(
+        rpc_client: RPCClient,
+        ckb_genesis_info: CKBGenesisInfo,
+        wallet: Wallet,
+        fee_rate: u64,
+    ) -> Self {
         Cleaner {
             rpc_client,
             ckb_genesis_info,
             wallet,
             consumed_verifiers: Arc::new(Mutex::new(Vec::new())),
+            fee_rate,
         }
     }
 
@@ -229,7 +236,13 @@ impl Cleaner {
             .push(to_input_cell_info(owner_input));
 
         let owner_lock = self.wallet.lock_script().to_owned();
-        fill_tx_fee(&mut tx_skeleton, &self.rpc_client.indexer, owner_lock).await?;
+        fill_tx_fee(
+            &mut tx_skeleton,
+            &self.rpc_client.indexer,
+            owner_lock,
+            self.fee_rate,
+        )
+        .await?;
         self.wallet.sign_tx_skeleton(tx_skeleton)
     }
 }

crates/block-producer/src/runner.rs

@@ -636,12 +636,14 @@ pub async fn run(config: Config, skip_config_check: bool) -> Result<()> {
                 contracts_dep_manager.clone(),
                 unlocker_wallet,
                 config.debug.clone(),
+                block_producer_config.fee_rate,
             );
 
             let cleaner = Arc::new(Cleaner::new(
                 rpc_client.clone(),
                 ckb_genesis_info.clone(),
                 wallet,
+                block_producer_config.fee_rate,
             ));
 
             let challenger_wallet = match block_producer_config.wallet_config {

crates/block-producer/src/withdrawal_unlocker.rs

@@ -39,9 +39,15 @@ impl FinalizedWithdrawalUnlocker {
         contracts_dep_manager: ContractsCellDepManager,
         wallet: Wallet,
         debug_config: DebugConfig,
+        fee_rate: u64,
     ) -> Self {
-        let unlocker =
-            DefaultUnlocker::new(rpc_client, ckb_genesis_info, contracts_dep_manager, wallet);
+        let unlocker = DefaultUnlocker::new(
+            rpc_client,
+            ckb_genesis_info,
+            contracts_dep_manager,
+            wallet,
+            fee_rate,
+        );
 
         FinalizedWithdrawalUnlocker {
             unlocker,
@@ -211,6 +217,7 @@ struct DefaultUnlocker {
     ckb_genesis_info: CKBGenesisInfo,
     contracts_dep_manager: ContractsCellDepManager,
     wallet: Wallet,
+    fee_rate: u64,
 }
 
 impl DefaultUnlocker {
@@ -221,12 +228,14 @@ impl DefaultUnlocker {
         ckb_genesis_info: CKBGenesisInfo,
         contracts_dep_manager: ContractsCellDepManager,
         wallet: Wallet,
+        fee_rate: u64,
     ) -> Self {
         DefaultUnlocker {
             rpc_client,
             ckb_genesis_info,
             contracts_dep_manager,
             wallet,
+            fee_rate,
         }
     }
 }
@@ -264,7 +273,13 @@ impl BuildUnlockWithdrawalToOwner for DefaultUnlocker {
         tx_skeleton.cell_deps_mut().push(owner_lock_dep);
 
         let owner_lock = self.wallet.lock_script().to_owned();
-        fill_tx_fee(&mut tx_skeleton, &self.rpc_client.indexer, owner_lock).await?;
+        fill_tx_fee(
+            &mut tx_skeleton,
+            &self.rpc_client.indexer,
+            owner_lock,
+            self.fee_rate,
+        )
+        .await?;
         self.wallet.sign_tx_skeleton(tx_skeleton)
     }
 }

crates/config/src/config.rs

@@ -167,6 +167,8 @@ pub struct RegistryAddressConfig {
 pub struct BlockProducerConfig {
     #[serde(default = "default_check_mem_block_before_submit")]
     pub check_mem_block_before_submit: bool,
+    #[serde(default = "default_fee_rate")]
+    pub fee_rate: u64,
     #[serde(flatten)]
     pub psc_config: PscConfig,
     pub block_producer: RegistryAddressConfig,
@@ -215,6 +217,10 @@ fn test_psc_config_optional() {
     );
 }
 
+const fn default_fee_rate() -> u64 {
+    1000
+}
+
 const fn default_check_mem_block_before_submit() -> bool {
     false
 }

crates/tools/src/main.rs

@@ -290,6 +290,7 @@ async fn main() -> Result<()> {
                 .arg(Arg::with_name("type-id").long("type-id").takes_value(true).required(true).help("The type-id of the exist cell"))
                 .arg(Arg::with_name("cell-data-path").long("cell-data-path").takes_value(true).required(true).help("The path of new data"))
                 .arg(arg_privkey_path.clone())
+                .arg(Arg::with_name("fee-rate").long("fee-rate").takes_value(true).required(false).default_value("1000").help("tx fee rate"))
         )
         .subcommand(
             SubCommand::with_name("deposit-ckb")
@@ -1038,20 +1039,22 @@ async fn main() -> Result<()> {
             let type_id = cli_args::to_h256(m.value_of("type-id").unwrap())?;
             let cell_data_path = Path::new(m.value_of("cell-data-path").unwrap());
             let privkey_path = Path::new(m.value_of("privkey-path").unwrap());
+            let fee_rate: u64 = m.value_of("fee-rate").unwrap().parse()?;
             let pk_path = {
                 let mut buf = PathBuf::new();
                 buf.push(privkey_path);
                 buf
             };
-            update_cell::update_cell(
+            update_cell::update_cell(update_cell::UpdateCellArgs {
                 ckb_rpc_url,
                 indexer_rpc_url,
                 tx_hash,
                 index,
                 type_id,
                 cell_data_path,
                 pk_path,
-            )
+                fee_rate,
+            })
             .await?;
         }
         Some(("deposit-ckb", m)) => {

crates/tools/src/update_cell.rs

@@ -15,15 +15,29 @@ use gw_utils::{
 };
 use std::path::{Path, PathBuf};
 
-pub async fn update_cell<P: AsRef<Path>>(
-    ckb_rpc_url: &str,
-    indexer_rpc_url: &str,
-    tx_hash: [u8; 32],
-    index: u32,
-    type_id: [u8; 32],
-    cell_data_path: P,
-    pk_path: PathBuf,
-) -> Result<()> {
+pub struct UpdateCellArgs<'a, P> {
+    pub ckb_rpc_url: &'a str,
+    pub indexer_rpc_url: &'a str,
+    pub tx_hash: [u8; 32],
+    pub index: u32,
+    pub type_id: [u8; 32],
+    pub cell_data_path: P,
+    pub pk_path: PathBuf,
+    pub fee_rate: u64,
+}
+
+pub async fn update_cell<P: AsRef<Path>>(args: UpdateCellArgs<'_, P>) -> Result<()> {
+    let UpdateCellArgs {
+        ckb_rpc_url,
+        indexer_rpc_url,
+        tx_hash,
+        index,
+        type_id,
+        cell_data_path,
+        pk_path,
+        fee_rate,
+    } = args;
+
     let mut rpc_client = CkbRpcClient::new(ckb_rpc_url);
     let indexer_client = CKBIndexerClient::with_url(indexer_rpc_url)?;
     // check existed_cell
@@ -105,7 +119,13 @@ pub async fn update_cell<P: AsRef<Path>>(
     // use same lock of existed cell to pay fee
     let payment_lock = existed_cell.lock();
     // tx fee cell
-    fill_tx_fee(&mut tx_skeleton, &indexer_client, payment_lock.clone()).await?;
+    fill_tx_fee(
+        &mut tx_skeleton,
+        &indexer_client,
+        payment_lock.clone(),
+        fee_rate,
+    )
+    .await?;
     // sign
     let wallet = Wallet::from_config(&WalletConfig {
         privkey_path: pk_path,

crates/traits/Cargo.toml

@@ -9,4 +9,4 @@ edition = "2018"
 [dependencies]
 gw-types = { path = "../types" }
 gw-common = { path = "../common" }
-gw-db = { path = "../db" }
+gw-db = { path = "../db" }

crates/tx-filter/Cargo.toml

@@ -13,4 +13,4 @@ gw-traits = { path = "../traits" }
 gw-types = { path = "../types" }
 thiserror = "1.0"
 log = "0.4"
-hex = "0.4"
+hex = "0.4"

crates/utils/src/fee.rs

@@ -20,10 +20,9 @@ use gw_types::{
 };
 
 /// Calculate tx fee
-/// TODO accept fee rate args
-fn calculate_required_tx_fee(tx_size: usize) -> u64 {
+fn calculate_required_tx_fee(tx_size: usize, fee_rate: u64) -> u64 {
     // tx_size * KB / MIN_FEE_RATE
-    tx_size as u64
+    (tx_size as u64) * fee_rate / 1000
 }
 
 /// Add fee cell to tx skeleton
@@ -32,6 +31,7 @@ pub async fn fill_tx_fee_with_local(
     client: &CKBIndexerClient,
     lock_script: Script,
     local_cells_manager: &LocalCellsManager,
+    fee_rate: u64,
 ) -> Result<()> {
     const CHANGE_CELL_CAPACITY: u64 = 61_00000000;
 
@@ -54,7 +54,7 @@ pub async fn fill_tx_fee_with_local(
     // calculate required fee
     // Try to generate a change output cell. If input cannot cover fee, query an owner cell.
     let tx_size = estimate_tx_size_with_change(tx_skeleton)?;
-    let tx_fee = calculate_required_tx_fee(tx_size);
+    let tx_fee = calculate_required_tx_fee(tx_size, fee_rate);
     let max_paid_fee = tx_skeleton
         .calculate_fee()?
         .saturating_sub(CHANGE_CELL_CAPACITY);
@@ -102,7 +102,7 @@ pub async fn fill_tx_fee_with_local(
             }));
 
         let tx_size = estimate_tx_size_with_change(tx_skeleton)?;
-        let tx_fee = calculate_required_tx_fee(tx_size);
+        let tx_fee = calculate_required_tx_fee(tx_size, fee_rate);
         let max_paid_fee = tx_skeleton
             .calculate_fee()?
             .saturating_sub(CHANGE_CELL_CAPACITY);
@@ -128,8 +128,16 @@ pub async fn fill_tx_fee(
     tx_skeleton: &mut TransactionSkeleton,
     client: &CKBIndexerClient,
     lock_script: Script,
+    fee_rate: u64,
 ) -> Result<()> {
-    fill_tx_fee_with_local(tx_skeleton, client, lock_script, &Default::default()).await
+    fill_tx_fee_with_local(
+        tx_skeleton,
+        client,
+        lock_script,
+        &Default::default(),
+        fee_rate,
+    )
+    .await
 }
 
 /// query payment cells, the returned cells should provide at least required_capacity fee,