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

Jump to bottom

add block_connector_service to miner #4141

Merged
merged 5 commits into from
Jun 20, 2024
Merged

add block_connector_service to miner #4141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bd634f2
add block_connector_service to miner
simonjiao Jun 18, 2024
99130f9
disable create_block_template tests
simonjiao Jun 19, 2024
f22d8d7
fix tests
simonjiao Jun 19, 2024
58a7046
remove unused codes
simonjiao Jun 19, 2024
e4ec216
use dagtest network for miner_service test
simonjiao Jun 19, 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
1 change: 1 addition & 0 deletions chain/src/chain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1743,6 +1743,7 @@ impl ChainReader for BlockChain {
)
}

//todo: return status as reference
fn status(&self) -> ChainStatus {
self.status.status.clone()
}
Expand Down
2 changes: 1 addition & 1 deletion config/src/genesis_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,7 +891,7 @@ pub static G_DEV_CONFIG: Lazy<GenesisConfig> = Lazy::new(|| {
min_action_delay: 60 * 60 * 1000, // 1h
},
transaction_timeout: ONE_DAY,
dag_effective_height: u64::MAX,
dag_effective_height: 0,
}
});

Expand Down
3 changes: 2 additions & 1 deletion miner/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ starcoin-txpool = { workspace = true }
starcoin-txpool-api = { workspace = true }
starcoin-vm-types = { workspace = true }
tokio = { features = ["full"], workspace = true }
starcoin-dag = { workspace =true }
starcoin-dag = { workspace = true }
starcoin-types = { workspace = true }
starcoin-sync = { workspace = true }

[dev-dependencies]
starcoin-network-rpc = { workspace = true }
Expand Down
Loading
Loading