Skip to content

Add shared storage #2233

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

Closed
wants to merge 38 commits into from
Closed

Add shared storage #2233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
9ca2763
models: add shared storage struct
Feb 1, 2022
2daf46b
store newly created block
gterzian Mar 3, 2022
12461d5
add issue link
gterzian Mar 4, 2022
cf8c591
reduce potential contention on lock
gterzian Mar 7, 2022
51646c4
Add storage on all block graph creation in tests.
AurelienFT Mar 7, 2022
eb9682d
Remove some compilation error on tests by changing the block in patte…
AurelienFT Mar 7, 2022
123a527
Fix compilation for all tests on protocol.
AurelienFT Mar 7, 2022
03e57a3
Add storage to closure of tests.
AurelienFT Mar 8, 2022
a455a8e
Change edition of active block in tests.
AurelienFT Mar 8, 2022
f1ec345
Remove block from activeblock.
AurelienFT Mar 8, 2022
07bb795
Fix some compilations errors now that exportactiveblock only take blo…
AurelienFT Mar 8, 2022
1620f10
Fix all remaning compile error.
AurelienFT Mar 8, 2022
be2dbd7
Add storing of genesis block.
AurelienFT Mar 9, 2022
1636537
Fix compilation error after rebase.
AurelienFT Mar 9, 2022
824dab0
Save block in storage in test.
AurelienFT Mar 9, 2022
94a24f0
Try things to have massa trace.
AurelienFT Mar 9, 2022
e03b2d4
Add storage to receive block.
AurelienFT Mar 9, 2022
28fc335
Remove misplaced save.
AurelienFT Mar 9, 2022
18aac47
Change block management in test because ExportActiveBlock now have th…
AurelienFT Mar 9, 2022
b7cb021
models: add shared storage struct
Feb 1, 2022
7fb6052
network: use shared storage
Feb 1, 2022
072ec86
execution: use shared storage
gterzian Mar 2, 2022
9d84b61
protocol: use shared storage
Feb 7, 2022
dee5cc6
Merge pull request #2304 from massalabs/shared_storage_protocol
gterzian Mar 10, 2022
bfd273e
Merge pull request #2305 from massalabs/network_shared_storage
gterzian Mar 10, 2022
be07875
Merge pull request #2322 from massalabs/execution_shared_storage
gterzian Mar 10, 2022
2a3b8ec
Merge branch 'shared_storage' into shared_storage_fix_tests
AurelienFT Mar 10, 2022
37905b9
Fix compilation errors.
AurelienFT Mar 10, 2022
9d24256
Fix compilation of tests.
AurelienFT Mar 10, 2022
b95666a
Fix checking of genesis in consensus.
AurelienFT Mar 10, 2022
9477b21
Fix fetch block too early in process block graph.
AurelienFT Mar 10, 2022
4f75727
Fix double storage in tests.
AurelienFT Mar 10, 2022
a62534e
Add the fetching of the block in the storag when receiving GetActiveB…
AurelienFT Mar 10, 2022
f8e9e42
Fix some tests.
AurelienFT Mar 10, 2022
9290463
Fix last test.
AurelienFT Mar 10, 2022
1da6802
Clean all warnings.
AurelienFT Mar 10, 2022
852d093
Merge pull request #2383 from massalabs/shared_storage_fix_tests
gterzian Mar 11, 2022
064c038
Fix protocol tests.
AurelienFT Mar 11, 2022
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
66 changes: 66 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

119 changes: 61 additions & 58 deletions massa-bootstrap/src/tests/tools.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,72 +371,75 @@ pub fn get_boot_state() -> (ExportProofOfStake, BootstrapableGraph) {
],
};

let block1 = ExportActiveBlock {
block: Block {
header: BlockHeader {
content: BlockHeaderContent {
creator: get_random_public_key(),
slot: Slot::new(1, 1),
parents: vec![get_dummy_block_id("p1"), get_dummy_block_id("p2")],
operation_merkle_root: Hash::compute_from("op_hash".as_bytes()),
endorsements: vec![
Endorsement {
content: EndorsementContent {
sender_public_key: get_random_public_key(),
slot: Slot::new(1, 0),
index: 1,
endorsed_block: get_dummy_block_id("p1"),
},
signature: get_dummy_signature("dummy_sig_0"),
let block = Block {
header: BlockHeader {
content: BlockHeaderContent {
creator: get_random_public_key(),
slot: Slot::new(1, 1),
parents: vec![get_dummy_block_id("p1"), get_dummy_block_id("p2")],
operation_merkle_root: Hash::compute_from("op_hash".as_bytes()),
endorsements: vec![
Endorsement {
content: EndorsementContent {
sender_public_key: get_random_public_key(),
slot: Slot::new(1, 0),
index: 1,
endorsed_block: get_dummy_block_id("p1"),
},
Endorsement {
content: EndorsementContent {
sender_public_key: get_random_public_key(),
slot: Slot::new(4, 1),
index: 3,
endorsed_block: get_dummy_block_id("p1"),
},
signature: get_dummy_signature("dummy_sig_00"),
signature: get_dummy_signature("dummy_sig_0"),
},
Endorsement {
content: EndorsementContent {
sender_public_key: get_random_public_key(),
slot: Slot::new(4, 1),
index: 3,
endorsed_block: get_dummy_block_id("p1"),
},
],
},
signature: get_dummy_signature("dummy_sig_1"),
signature: get_dummy_signature("dummy_sig_00"),
},
],
},
operations: vec![
Operation {
content: OperationContent {
sender_public_key: get_random_public_key(),
fee: Amount::from_str("1524878").unwrap(),
expire_period: 5787899,
op: massa_models::OperationType::Transaction {
recipient_address: get_random_address(),
amount: Amount::from_str("1259787").unwrap(),
},
signature: get_dummy_signature("dummy_sig_1"),
},
operations: vec![
Operation {
content: OperationContent {
sender_public_key: get_random_public_key(),
fee: Amount::from_str("1524878").unwrap(),
expire_period: 5787899,
op: massa_models::OperationType::Transaction {
recipient_address: get_random_address(),
amount: Amount::from_str("1259787").unwrap(),
},
signature: get_dummy_signature("dummy_sig_2"),
},
Operation {
content: OperationContent {
sender_public_key: get_random_public_key(),
fee: Amount::from_str("878763222").unwrap(),
expire_period: 4557887,
op: massa_models::OperationType::RollBuy { roll_count: 45544 },
},
signature: get_dummy_signature("dummy_sig_3"),
signature: get_dummy_signature("dummy_sig_2"),
},
Operation {
content: OperationContent {
sender_public_key: get_random_public_key(),
fee: Amount::from_str("878763222").unwrap(),
expire_period: 4557887,
op: massa_models::OperationType::RollBuy { roll_count: 45544 },
},
Operation {
content: OperationContent {
sender_public_key: get_random_public_key(),
fee: Amount::from_str("4545").unwrap(),
expire_period: 452524,
op: massa_models::OperationType::RollSell {
roll_count: 4888787,
},
signature: get_dummy_signature("dummy_sig_3"),
},
Operation {
content: OperationContent {
sender_public_key: get_random_public_key(),
fee: Amount::from_str("4545").unwrap(),
expire_period: 452524,
op: massa_models::OperationType::RollSell {
roll_count: 4888787,
},
signature: get_dummy_signature("dummy_sig_4"),
},
],
},
signature: get_dummy_signature("dummy_sig_4"),
},
],
};

//TODO: We currently lost information. Need to use shared storage
let block1 = ExportActiveBlock {
block: block,
parents: vec![
(get_dummy_block_id("b1"), 4777),
(get_dummy_block_id("b2"), 8870),
Expand Down
2 changes: 1 addition & 1 deletion massa-consensus-exports/src/consensus_controller.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ use crate::{
pub struct ConsensusCommandSender(pub mpsc::Sender<ConsensusCommand>);

impl ConsensusCommandSender {
/// Gets all the aviable information on the block graph returning a Blockgraphexport.
/// Gets all the available information on the block graph returning a Blockgraphexport.
///
/// # Arguments
/// * slot_start: optional slot start for slot-based filtering (included).
Expand Down
5 changes: 5 additions & 0 deletions massa-consensus-worker/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ tempfile = "3.2"
massa_models = { path = "../massa-models", features = ["testing"] }
massa_execution_exports = { path = "../massa-execution-exports", features = ["testing"] }
massa_consensus_exports = { path = "../massa-consensus-exports", features = ["testing"] }
env_logger = "*"
tracing = {version = "0.1", default-features = false}
tracing-subscriber = {version = "0.3", default-features = false, features = ["env-filter", "fmt"]}
test-log = {version = "0.2.8", features = ["trace"]}
console-subscriber = "0.1.1"

[features]
instrument = ["tokio/tracing", "massa_consensus_exports/instrument", "massa_graph/instrument", "massa_models/instrument", "massa_pool/instrument", "massa_proof_of_stake_exports/instrument", "massa_protocol_exports/instrument", "massa_time/instrument"]
Expand Down
Loading