Bump version v1.7.3

.github/workflows/rust.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Cargo clippy check
         env:
           RUSTFLAGS: -D warnings
-        run: cargo clippy --all-targets
+        run: cargo clippy --tests --all-features --all-targets
       - name: Copy contracts from prebuild docker images
         run: devtools/fetch-binaries.sh
       - name: Tests

.github/workflows/scripts.yml

@@ -4,9 +4,11 @@ on:
   push:
     paths:
       - 'gwos/**'
+      - 'crates/tests/src/script_tests/**'
   pull_request:
     paths:
       - 'gwos/**'
+      - 'crates/tests/src/script_tests/**'
 
 jobs:
   build:

CHANGELOG.md

@@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com).
 
 ## [Unreleased]
 
+## [v1.7.3] - 2022-11-27
+
+- config: deny unknown fields in the config toml file [#862](https://github.com/godwokenrises/godwoken/pull/862)
+- Cherry pick commits from develop branch to fix CI script tests [#878](https://github.com/godwokenrises/godwoken/pull/878)
+
 ## [v1.7.2] - 2022-11-25
 
 - fix: use mem pool state for “get block” RPCs [#871](https://github.com/godwokenrises/godwoken/pull/871)

crates/benches/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gw-benches"
-version = "1.7.2"
+version = "1.7.3"
 authors = ["Nervos Network"]
 edition = "2018"
 description = "Godwoken benchmarks."
@@ -20,6 +20,7 @@ gw-types = { path = "../types" }
 gw-traits = { path = "../traits" }
 gw-db = { path = "../db" }
 gw-config = { path = "../config" }
+gw-utils = { path = "../utils" }
 
 [[bench]]
 name = "bench_main"

crates/benches/benches/benchmarks/smt.rs

@@ -32,7 +32,6 @@ use gw_traits::{ChainView, CodeStore};
 use gw_types::{
     bytes::Bytes,
     core::{AllowedEoaType, ScriptHashType, Status},
-    offchain::RollupContext,
     packed::{
         AccountMerkleState, AllowedTypeHash, BlockInfo, BlockMerkleState, Fee, GlobalState,
         L2Block, RawL2Block, RawL2Transaction, RollupConfig, SUDTArgs, SUDTTransfer, Script,
@@ -41,6 +40,7 @@ use gw_types::{
     prelude::*,
     U256,
 };
+use gw_utils::RollupContext;
 use pprof::criterion::{Output, PProfProfiler};
 
 // meta contract
@@ -147,6 +147,7 @@ impl BenchExecutionEnvironment {
         let rollup_context = RollupContext {
             rollup_config: genesis_config.rollup_config.clone().into(),
             rollup_script_hash: ROLLUP_TYPE_HASH.into(),
+            fork_config: Default::default(),
         };
 
         let backend_manage = {
@@ -180,7 +181,6 @@ impl BenchExecutionEnvironment {
 
         let generator = Generator::new(
             backend_manage,
-            Default::default(),
             account_lock_manage,
             rollup_context,
             Default::default(),

crates/benches/benches/benchmarks/sudt.rs

@@ -22,12 +22,13 @@ use gw_traits::{ChainView, CodeStore};
 use gw_types::{
     bytes::Bytes,
     core::{AllowedEoaType, ScriptHashType},
-    offchain::{RollupContext, RunResult},
+    offchain::RunResult,
     packed::{AllowedTypeHash, BlockInfo, Fee},
     packed::{RawL2Transaction, RollupConfig, SUDTArgs, SUDTTransfer, Script},
     prelude::*,
     U256,
 };
+use gw_utils::RollupContext;
 
 const DUMMY_SUDT_VALIDATOR_SCRIPT_TYPE_HASH: [u8; 32] = [3u8; 32];
 
@@ -104,23 +105,18 @@ fn run_contract_get_result<S: State + CodeStore + JournalDB>(
     let rollup_ctx = RollupContext {
         rollup_config: rollup_config.clone(),
         rollup_script_hash: [42u8; 32].into(),
+        fork_config: Default::default(),
     };
     let generator = Generator::new(
         backend_manage,
-        Default::default(),
         account_lock_manage,
         rollup_ctx,
         Default::default(),
     );
     let chain_view = DummyChainStore;
-    let run_result = generator.execute_transaction(
-        &chain_view,
-        tree,
-        block_info,
-        &raw_tx,
-        Some(u64::MAX),
-        None,
-    )?;
+    let run_result = generator
+        .execute_transaction(&chain_view, tree, block_info, &raw_tx, Some(u64::MAX), None)
+        .map_err(|err| err.downcast::<TransactionError>().expect("tx error"))?;
     tree.finalise()?;
     Ok(run_result)
 }

crates/block-producer/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gw-block-producer"
-version = "1.7.2"
+version = "1.7.3"
 authors = ["Nervos Network"]
 edition = "2021"
 

crates/block-producer/src/block_producer.rs

@@ -24,7 +24,7 @@ use gw_rpc_client::{contract::ContractsCellDepManager, rpc_client::RPCClient};
 use gw_store::Store;
 use gw_types::{
     bytes::Bytes,
-    offchain::{DepositInfo, InputCellInfo, RollupContext},
+    offchain::{DepositInfo, InputCellInfo},
     packed::{
         CellDep, CellInput, CellOutput, GlobalState, L2Block, RollupAction, RollupActionUnion,
         RollupSubmitBlock, Transaction, WithdrawalRequestExtra, WitnessArgs,
@@ -34,6 +34,7 @@ use gw_types::{
 use gw_utils::{
     fee::fill_tx_fee_with_local, genesis_info::CKBGenesisInfo, local_cells::LocalCellsManager,
     query_rollup_cell, since::Since, transaction_skeleton::TransactionSkeleton, wallet::Wallet,
+    RollupContext,
 };
 use std::{collections::HashSet, sync::Arc, time::Instant};
 use tokio::sync::Mutex;