Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
64 changes: 26 additions & 38 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ resolver = "2"
zingo_test_vectors = { path = "zingo_test_vectors" }

# zebra
zebra-chain = "3.0"
zebra-chain = "4.0"
zebra-node-services = "2.0"
zebra-rpc = "3.0"
zebra-rpc = "4.0"

# other
http = "1.1.0"
Expand Down
17 changes: 10 additions & 7 deletions regtest-launcher/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,16 @@ async fn main() {
);
let client = RpcRequestClient::new(SocketAddr::from_str(&rpc_addr.to_string()).unwrap());

let regtest_network = Network::Testnet(Arc::new(Parameters::new_regtest(RegtestParameters {
activation_heights: heights,
funding_streams: None,
lockbox_disbursements: None,
checkpoints: None,
extend_funding_stream_addresses_as_required: None,
})));
let regtest_network = Network::Testnet(Arc::new(
Parameters::new_regtest(RegtestParameters {
activation_heights: heights,
funding_streams: None,
lockbox_disbursements: None,
checkpoints: None,
extend_funding_stream_addresses_as_required: None,
})
.unwrap(),
));

let running = Arc::new(AtomicBool::new(true));
let running_miner = running.clone();
Expand Down