Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chain add directly save special block without execute #4009

Closed
wants to merge 19 commits into from
Closed

chain add directly save special block without execute #4009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5d23b83
Change new repository version for move language which has fixed argum…
welbon Feb 18, 2024
e26d1c6
add the db-export decode payload command code
welbon Feb 19, 2024
0a2fd42
fixed compile error
welbon Feb 20, 2024
985d02d
fixed build error
welbon Feb 20, 2024
5cb6a56
fix timestamp error
welbon Feb 20, 2024
4214458
add decode payload to main command
welbon Feb 20, 2024
53e5931
commit all code
welbon Feb 20, 2024
e920344
add signer filter
welbon Feb 20, 2024
7aaae2a
change the loading block action to parallel
welbon Feb 20, 2024
9679d68
fix progress bar show
welbon Feb 20, 2024
47cb159
fixed clippy
welbon Feb 21, 2024
615fc35
db_exporter add verify blocks without save
nkysg Feb 20, 2024
ff82393
chain add directly save special block without execute
nkysg Feb 20, 2024
352447f
db_exporter add output block execute (writeset and blockinfo)
nkysg Feb 20, 2024
fe63749
add MAIN_DIRECT_SAVE_BLOCK_HASH_MAP
nkysg Feb 21, 2024
18dc7dd
update verify block
nkysg Feb 21, 2024
1199d48
fix execute_block_without_save
nkysg Feb 21, 2024
d819422
fix db_export verify-blocks
nkysg Feb 21, 2024
8595bbf
fix cargo fmt
nkysg Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 43 additions & 39 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

52 changes: 26 additions & 26 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,31 +333,31 @@ log4rs = { version = "1.2.0", features = ["background_rotation", "gzip"] }
lru = "0.7.8"
merkletree = { version = "0.22.1" }
mirai-annotations = "1.10.1"
move-binary-format = { git = "https://github.com/starcoinorg/move", rev = "127584f4cb1e2b4cd650f1e6c317250f5fccca49" }
move-bytecode-source-map = { git = "https://github.com/starcoinorg/move", rev = "127584f4cb1e2b4cd650f1e6c317250f5fccca49" }
move-bytecode-verifier = { git = "https://github.com/starcoinorg/move", rev = "127584f4cb1e2b4cd650f1e6c317250f5fccca49" }
move-cli = { git = "https://github.com/starcoinorg/move", rev = "127584f4cb1e2b4cd650f1e6c317250f5fccca49" }
move-command-line-common = { git = "https://github.com/starcoinorg/move", rev = "127584f4cb1e2b4cd650f1e6c317250f5fccca49" }
move-compiler = { git = "https://github.com/starcoinorg/move", rev = "127584f4cb1e2b4cd650f1e6c317250f5fccca49" }
move-core-types = { git = "https://github.com/starcoinorg/move", rev = "127584f4cb1e2b4cd650f1e6c317250f5fccca49" }
move-coverage = { git = "https://github.com/starcoinorg/move", rev = "127584f4cb1e2b4cd650f1e6c317250f5fccca49" }
move-disassembler = { git = "https://github.com/starcoinorg/move", rev = "127584f4cb1e2b4cd650f1e6c317250f5fccca49" }
move-docgen = { git = "https://github.com/starcoinorg/move", rev = "127584f4cb1e2b4cd650f1e6c317250f5fccca49" }
move-errmapgen = { git = "https://github.com/starcoinorg/move", rev = "127584f4cb1e2b4cd650f1e6c317250f5fccca49" }
move-ir-compiler = { git = "https://github.com/starcoinorg/move", rev = "127584f4cb1e2b4cd650f1e6c317250f5fccca49" }
move-ir-types = { git = "https://github.com/starcoinorg/move", rev = "127584f4cb1e2b4cd650f1e6c317250f5fccca49" }
move-model = { git = "https://github.com/starcoinorg/move", rev = "127584f4cb1e2b4cd650f1e6c317250f5fccca49" }
move-package = { git = "https://github.com/starcoinorg/move", rev = "127584f4cb1e2b4cd650f1e6c317250f5fccca49" }
move-prover = { git = "https://github.com/starcoinorg/move", rev = "127584f4cb1e2b4cd650f1e6c317250f5fccca49" }
move-prover-test-utils = { git = "https://github.com/starcoinorg/move", rev = "127584f4cb1e2b4cd650f1e6c317250f5fccca49" }
move-resource-viewer = { git = "https://github.com/starcoinorg/move", rev = "127584f4cb1e2b4cd650f1e6c317250f5fccca49" }
move-stdlib = { git = "https://github.com/starcoinorg/move", rev = "127584f4cb1e2b4cd650f1e6c317250f5fccca49" }
move-transactional-test-runner = { git = "https://github.com/starcoinorg/move", rev = "127584f4cb1e2b4cd650f1e6c317250f5fccca49" }
move-unit-test = { git = "https://github.com/starcoinorg/move", rev = "127584f4cb1e2b4cd650f1e6c317250f5fccca49", features = ["table-extension"] }
move-vm-runtime = { git = "https://github.com/starcoinorg/move", rev = "127584f4cb1e2b4cd650f1e6c317250f5fccca49" }
move-vm-types = { git = "https://github.com/starcoinorg/move", rev = "127584f4cb1e2b4cd650f1e6c317250f5fccca49" }
move-table-extension = { git = "https://github.com/starcoinorg/move", rev = "127584f4cb1e2b4cd650f1e6c317250f5fccca49" }
move-vm-test-utils = { git = "https://github.com/starcoinorg/move", rev = "127584f4cb1e2b4cd650f1e6c317250f5fccca49", features = ["table-extension"] }
move-binary-format = { git = "https://github.com/starcoinorg/move", rev = "15d764f35c1131437b0e3be262bfa5f9b449ce16" }
move-bytecode-source-map = { git = "https://github.com/starcoinorg/move", rev = "15d764f35c1131437b0e3be262bfa5f9b449ce16" }
move-bytecode-verifier = { git = "https://github.com/starcoinorg/move", rev = "15d764f35c1131437b0e3be262bfa5f9b449ce16" }
move-cli = { git = "https://github.com/starcoinorg/move", rev = "15d764f35c1131437b0e3be262bfa5f9b449ce16" }
move-command-line-common = { git = "https://github.com/starcoinorg/move", rev = "15d764f35c1131437b0e3be262bfa5f9b449ce16" }
move-compiler = { git = "https://github.com/starcoinorg/move", rev = "15d764f35c1131437b0e3be262bfa5f9b449ce16" }
move-core-types = { git = "https://github.com/starcoinorg/move", rev = "15d764f35c1131437b0e3be262bfa5f9b449ce16" }
move-coverage = { git = "https://github.com/starcoinorg/move", rev = "15d764f35c1131437b0e3be262bfa5f9b449ce16" }
move-disassembler = { git = "https://github.com/starcoinorg/move", rev = "15d764f35c1131437b0e3be262bfa5f9b449ce16" }
move-docgen = { git = "https://github.com/starcoinorg/move", rev = "15d764f35c1131437b0e3be262bfa5f9b449ce16" }
move-errmapgen = { git = "https://github.com/starcoinorg/move", rev = "15d764f35c1131437b0e3be262bfa5f9b449ce16" }
move-ir-compiler = { git = "https://github.com/starcoinorg/move", rev = "15d764f35c1131437b0e3be262bfa5f9b449ce16" }
move-ir-types = { git = "https://github.com/starcoinorg/move", rev = "15d764f35c1131437b0e3be262bfa5f9b449ce16" }
move-model = { git = "https://github.com/starcoinorg/move", rev = "15d764f35c1131437b0e3be262bfa5f9b449ce16" }
move-package = { git = "https://github.com/starcoinorg/move", rev = "15d764f35c1131437b0e3be262bfa5f9b449ce16" }
move-prover = { git = "https://github.com/starcoinorg/move", rev = "15d764f35c1131437b0e3be262bfa5f9b449ce16" }
move-prover-test-utils = { git = "https://github.com/starcoinorg/move", rev = "15d764f35c1131437b0e3be262bfa5f9b449ce16" }
move-resource-viewer = { git = "https://github.com/starcoinorg/move", rev = "15d764f35c1131437b0e3be262bfa5f9b449ce16" }
move-stdlib = { git = "https://github.com/starcoinorg/move", rev = "15d764f35c1131437b0e3be262bfa5f9b449ce16" }
move-transactional-test-runner = { git = "https://github.com/starcoinorg/move", rev = "15d764f35c1131437b0e3be262bfa5f9b449ce16" }
move-unit-test = { git = "https://github.com/starcoinorg/move", rev = "15d764f35c1131437b0e3be262bfa5f9b449ce16", features = ["table-extension"] }
move-vm-runtime = { git = "https://github.com/starcoinorg/move", rev = "15d764f35c1131437b0e3be262bfa5f9b449ce16" }
move-vm-types = { git = "https://github.com/starcoinorg/move", rev = "15d764f35c1131437b0e3be262bfa5f9b449ce16" }
move-table-extension = { git = "https://github.com/starcoinorg/move", rev = "15d764f35c1131437b0e3be262bfa5f9b449ce16" }
move-vm-test-utils = { git = "https://github.com/starcoinorg/move", rev = "15d764f35c1131437b0e3be262bfa5f9b449ce16", features = ["table-extension"] }

names = { version = "0.14.0", default-features = false }
network-api = { path = "network/api", package = "network-api" }
Expand Down Expand Up @@ -522,7 +522,7 @@ unsigned-varint = { version = "0.6.0", features = [
"futures",
"asynchronous_codec",
] }
vm = { package = "move-binary-format", git = "https://github.com/starcoinorg/move", rev = "127584f4cb1e2b4cd650f1e6c317250f5fccca49", features = [
vm = { package = "move-binary-format", git = "https://github.com/starcoinorg/move", rev = "15d764f35c1131437b0e3be262bfa5f9b449ce16", features = [
"fuzzing",
] }
vm-status-translator = { path = "vm/vm-status-translator" }
Expand Down
2 changes: 2 additions & 0 deletions chain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ starcoin-types = { package = "starcoin-types", workspace = true }
starcoin-vm-types = { workspace = true }
starcoin-storage = { workspace = true }
thiserror = { workspace = true }
once_cell = { workspace = true }
serde_json = { features = ["arbitrary_precision"], workspace = true }

[dev-dependencies]
proptest = { workspace = true }
Expand Down
1 change: 1 addition & 0 deletions chain/api/src/chain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ pub trait ChainReader {
fn verify(&self, block: Block) -> Result<VerifiedBlock>;
/// Execute block and verify it execute state, and save result base current chain, but do not change current chain.
fn execute(&self, block: VerifiedBlock) -> Result<ExecutedBlock>;
fn execute_without_save(&self, verified_block: VerifiedBlock) -> Result<ExecutedBlock>;
/// Get chain transaction infos
fn get_transaction_infos(
&self,
Expand Down
817 changes: 813 additions & 4 deletions chain/src/chain.rs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion chain/src/verifier/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use starcoin_logger::prelude::debug;
use starcoin_types::block::{Block, BlockHeader, ALLOWED_FUTURE_BLOCKTIME};
use std::{collections::HashSet, str::FromStr};

#[derive(Debug)]
#[derive(Debug, Clone)]
pub enum Verifier {
Basic,
Consensus,
Expand Down
2 changes: 2 additions & 0 deletions cmd/db-exporter/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,11 @@ starcoin-transaction-builder = { workspace = true }
starcoin-types = { workspace = true }
starcoin-vm-types = { workspace = true }
starcoin-vm-runtime = { workspace = true }
starcoin-abi-decoder = { workspace = true }
futures = { workspace = true }
rayon = { workspace = true }
num_cpus = { workspace = true }
chrono = { workspace = true }

[package]
authors = { workspace = true }
Expand Down
119 changes: 0 additions & 119 deletions cmd/db-exporter/src/cmd_batch_execution.rs
View file
Open in desktop

This file was deleted.

Loading
Loading