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.

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

build: update to tenderdash 1.1.0-dev.3, rs-tenderdash-abci 1.1.0-dev.1 #2008

Merged
merged 2 commits into from
Jul 25, 2024
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
91 changes: 82 additions & 9 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion packages/dapi-grpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ tonic = { version = "0.11", features = [
serde = { version = "1.0.197", optional = true, features = ["derive"] }
serde_bytes = { version = "0.11.12", optional = true }
serde_json = { version = "1.0", optional = true }
tenderdash-proto = { git = "https://github.com/dashpay/rs-tenderdash-abci", version = "1.0.0", tag = "v1.0.0", default-features = false, features = [
tenderdash-proto = { git = "https://github.com/dashpay/rs-tenderdash-abci", version = "1.1.0-dev.1", tag = "v1.1.0-dev.1", default-features = false, features = [
"grpc",
] }
dapi-grpc-macros = { path = "../rs-dapi-grpc-macros" }
Expand Down
2 changes: 1 addition & 1 deletion packages/dashmate/configs/defaults/getBaseConfigFactory.js
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ export default function getBaseConfigFactory(homeDir) {
tenderdash: {
mode: 'full',
docker: {
image: 'dashpay/tenderdash:1.1.0-dev.2',
image: 'dashpay/tenderdash:1.1.0-dev.3',
},
p2p: {
host: '0.0.0.0',
Expand Down
3 changes: 3 additions & 0 deletions packages/dashmate/configs/getConfigFileMigrationsFactory.js
Original file line number Diff line number Diff line change
Expand Up @@ -726,6 +726,9 @@ export default function getConfigFileMigrationsFactory(homeDir, defaultConfigs)
if (options.network === NETWORK_TESTNET) {
options.platform.drive.tenderdash.genesis = testnet.get('platform.drive.tenderdash.genesis');
}

// Update tenderdash image
options.platform.drive.tenderdash.docker.image = base.get('platform.drive.tenderdash.docker.image');
});
return configFile;
},
Expand Down
2 changes: 1 addition & 1 deletion packages/rs-drive-abci/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ tracing-subscriber = { version = "0.3.16", default-features = false, features =
"tracing-log",
], optional = false }
atty = { version = "0.2.14", optional = false }
tenderdash-abci = { git = "https://github.com/dashpay/rs-tenderdash-abci", version = "1.0.0", tag = "v1.0.0", features = [
tenderdash-abci = { git = "https://github.com/dashpay/rs-tenderdash-abci", version = "1.1.0-dev.1", tag = "v1.1.0-dev.1", features = [
"grpc",
] }
lazy_static = "1.4.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ where
validator_set_update: Some(validator_set),
next_core_chain_lock_update: None,
initial_core_height: core_height, // we send back the core height when the fork happens
genesis_time: None,
})
}
}
2 changes: 1 addition & 1 deletion packages/rs-drive-proof-verifier/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dpp = { path = "../rs-dpp", features = [
bincode = { version = "2.0.0-rc.3", features = ["serde"], optional = true }
platform-serialization-derive = { path = "../rs-platform-serialization-derive", optional = true }
platform-serialization = { path = "../rs-platform-serialization", optional = true }
tenderdash-abci = { git = "https://github.com/dashpay/rs-tenderdash-abci", version = "1.0.0", tag = "v1.0.0", features = [
tenderdash-abci = { git = "https://github.com/dashpay/rs-tenderdash-abci", version = "1.1.0-dev.1", tag = "v1.1.0-dev.1", features = [
"crypto",
], default-features = false }
tracing = { version = "0.1.37" }
Expand Down
Loading