fix(mempool): pool cycles not reset on next mem block for readonly no…

…de (#781) * fix(mempool): pool cycles not reset on next mem block for readonly node (#781) * fix(mempool): verify txs from fullnode Right now, fullnode publish tx only after finalization. But we should not depend on this behaviour. For readonly node, we should verify cylces instead of blindly trust fullnode. * refactor(mempool): recreate cycles pool from config In case we migrate to dynamic config in the future
godwokenrises · Aug 15, 2022 · 7e51d1a · 7e51d1a
2 parents 8f83d91 + c36b022
commit 7e51d1a
Show file tree

Hide file tree

Showing 31 changed files with 67 additions and 56 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@ 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)
 - Support non EIP-155 transaction [#777](https://github.com/nervosnetwork/godwoken/pull/777)
 
+## [v1.5.0-rc2] - 2022-08-12
+
+- fix(mempool): pool cycles not reset on next mem block for readonly node [#781](https://github.com/nervosnetwork/godwoken/pull/781)
+
 ## [v1.5.0-rc1] - 2022-08-09
 
 - fix(tests): wait withdrawal pushed into mem pool [#774](https://github.com/nervosnetwork/godwoken/pull/774)

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/benches/Cargo.toml b/crates/benches/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-benches"
-version = "1.5.0-rc1"
+version = "1.5.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 description = "Godwoken benchmarks."

diff --git a/crates/block-producer/Cargo.toml b/crates/block-producer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-block-producer"
-version = "1.5.0-rc1"
+version = "1.5.0-rc2"
 authors = ["Nervos Network"]
 edition = "2021"
 

diff --git a/crates/chain/Cargo.toml b/crates/chain/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-chain"
-version = "1.5.0-rc1"
+version = "1.5.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 

diff --git a/crates/challenge/Cargo.toml b/crates/challenge/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-challenge"
-version = "1.5.0-rc1"
+version = "1.5.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 

diff --git a/crates/ckb-hardfork/Cargo.toml b/crates/ckb-hardfork/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-ckb-hardfork"
-version = "1.5.0-rc1"
+version = "1.5.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 

diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-common"
-version = "1.5.0-rc1"
+version = "1.5.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 

diff --git a/crates/config/Cargo.toml b/crates/config/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-config"
-version = "1.5.0-rc1"
+version = "1.5.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 

diff --git a/crates/db/Cargo.toml b/crates/db/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-db"
-version = "1.5.0-rc1"
+version = "1.5.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 

diff --git a/crates/dynamic-config/Cargo.toml b/crates/dynamic-config/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-dynamic-config"
-version = "1.5.0-rc1"
+version = "1.5.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 

diff --git a/crates/eoa-mapping/Cargo.toml b/crates/eoa-mapping/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-eoa-mapping"
-version = "1.5.0-rc1"
+version = "1.5.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 

diff --git a/crates/generator/Cargo.toml b/crates/generator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-generator"
-version = "1.5.0-rc1"
+version = "1.5.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 

diff --git a/crates/godwoken-bin/Cargo.toml b/crates/godwoken-bin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "godwoken-bin"
-version = "1.5.0-rc1"
+version = "1.5.0-rc2"
 authors = ["Nervos Network"]
 edition = "2021"
 

diff --git a/crates/hash/Cargo.toml b/crates/hash/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-hash"
-version = "1.5.0-rc1"
+version = "1.5.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 

diff --git a/crates/jsonrpc-types/Cargo.toml b/crates/jsonrpc-types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-jsonrpc-types"
-version = "1.5.0-rc1"
+version = "1.5.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 

diff --git a/crates/mem-pool/Cargo.toml b/crates/mem-pool/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw-mem-pool"
-version = "1.5.0-rc1"
+version = "1.5.0-rc2"
 authors = ["Nervos Network"]
 edition = "2018"
 

diff --git a/crates/mem-pool/src/pool.rs b/crates/mem-pool/src/pool.rs
@@ -1271,6 +1271,13 @@ impl MemPool {
         let db = self.store.begin_transaction();
         self.remove_unexecutables(&mut mem_state, &db).await?;
 
+        // reset cycles pool available cycles.
+        // recreate from config, in case we migrate to dynamic config in the future.
+        self.cycles_pool = CyclesPool::new(
+            self.mem_block_config.max_cycles_limit,
+            self.mem_block_config.syscall_cycles.clone(),
+        );
+
         // prepare next mem block
         self.try_package_more_withdrawals(&mem_state, &mut withdrawals);
         self.prepare_next_mem_block(&db, &mut mem_state, withdrawals, deposits, mem_block_txs)