Skip to content

Commit

Permalink
Merge remote-tracking branch 'namada/tomas/add-consensus-commit-timeo…
Browse files Browse the repository at this point in the history 
…ut' (#671) into main

* namada/tomas/add-consensus-commit-timeout:
  [ci] wasm checksums update
  changelog: add #671
  add back consensus timeout commit config for abciplus
  switch to tendermint-rs with consensus timeout
  • Loading branch information
@juped
juped committed Oct 31, 2022
2 parents 06224f5 + 31084fb commit ff947e8
Show file tree
Hide file tree
Showing 9 changed files with 49 additions and 41 deletions.
2 changes: 2 additions & 0 deletions .changelog/unreleased/bug-fixes/671-add-consensus-commit-timeout.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Add back consensus commit timeout configuration set in tendermint
([#671](https://github.com/anoma/namada/pull/671))
12 changes: 6 additions & 6 deletions Cargo.lock
View file

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

14 changes: 7 additions & 7 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ async-process = {git = "https://github.com/heliaxdev/async-process.git", rev = "
# borsh-derive-internal = {path = "../borsh-rs/borsh-derive-internal"}
# borsh-schema-derive-internal = {path = "../borsh-rs/borsh-schema-derive-internal"}

# patched to a commit on the `eth-bridge-integration` branch of our fork
tendermint = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "87be41b8c9cc2850830f4d8028c1fe1bd9f96284"}
tendermint-config = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "87be41b8c9cc2850830f4d8028c1fe1bd9f96284"}
tendermint-proto = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "87be41b8c9cc2850830f4d8028c1fe1bd9f96284"}
tendermint-rpc = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "87be41b8c9cc2850830f4d8028c1fe1bd9f96284"}
tendermint-testgen = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "87be41b8c9cc2850830f4d8028c1fe1bd9f96284"}
tendermint-light-client-verifier = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "87be41b8c9cc2850830f4d8028c1fe1bd9f96284"}
# patched to a commit on the `eth-bridge-integration+consensus-timeout` branch of our fork
tendermint = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "e6c684731f21bffd89886d3e91074b96aee074ba"}
tendermint-config = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "e6c684731f21bffd89886d3e91074b96aee074ba"}
tendermint-proto = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "e6c684731f21bffd89886d3e91074b96aee074ba"}
tendermint-rpc = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "e6c684731f21bffd89886d3e91074b96aee074ba"}
tendermint-testgen = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "e6c684731f21bffd89886d3e91074b96aee074ba"}
tendermint-light-client-verifier = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "e6c684731f21bffd89886d3e91074b96aee074ba"}

# patched to a commit on the `eth-bridge-integration` branch of our fork
ibc = {git = "https://github.com/heliaxdev/ibc-rs.git", rev = "f4703dfe2c1f25cc431279ab74f10f3e0f6827e2"}
Expand Down
6 changes: 6 additions & 0 deletions apps/src/lib/node/ledger/tendermint_node.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,12 @@ async fn update_tendermint_config(
config.instrumentation.namespace =
tendermint_config.instrumentation_namespace;

#[cfg(feature = "abciplus")]
{
config.consensus.timeout_commit =
tendermint_config.consensus_timeout_commit;
}

let mut file = OpenOptions::new()
.write(true)
.truncate(true)
Expand Down
8 changes: 4 additions & 4 deletions wasm/Cargo.lock
View file

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

8 changes: 4 additions & 4 deletions wasm/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ borsh-derive = {git = "https://github.com/heliaxdev/borsh-rs.git", rev = "cd5223
borsh-derive-internal = {git = "https://github.com/heliaxdev/borsh-rs.git", rev = "cd5223e5103c4f139e0c54cf8259b7ec5ec4073a"}
borsh-schema-derive-internal = {git = "https://github.com/heliaxdev/borsh-rs.git", rev = "cd5223e5103c4f139e0c54cf8259b7ec5ec4073a"}
# patched to a commit on the `eth-bridge-integration` branch of our fork
tendermint = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "87be41b8c9cc2850830f4d8028c1fe1bd9f96284"}
tendermint-proto = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "87be41b8c9cc2850830f4d8028c1fe1bd9f96284"}
tendermint-testgen = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "87be41b8c9cc2850830f4d8028c1fe1bd9f96284"}
tendermint-light-client-verifier = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "87be41b8c9cc2850830f4d8028c1fe1bd9f96284"}
tendermint = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "e6c684731f21bffd89886d3e91074b96aee074ba"}
tendermint-proto = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "e6c684731f21bffd89886d3e91074b96aee074ba"}
tendermint-testgen = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "e6c684731f21bffd89886d3e91074b96aee074ba"}
tendermint-light-client-verifier = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "e6c684731f21bffd89886d3e91074b96aee074ba"}

# patched to a commit on the `eth-bridge-integration` branch of our fork
ibc = {git = "https://github.com/heliaxdev/ibc-rs.git", rev = "f4703dfe2c1f25cc431279ab74f10f3e0f6827e2"}
Expand Down
24 changes: 12 additions & 12 deletions wasm/checksums.json
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"tx_bond.wasm": "tx_bond.9c707107c37e66a7e89b541aa7152c0b4ce2c8684f1dd7193f0b5130e73f5e06.wasm",
"tx_ibc.wasm": "tx_ibc.878465c735658ef1f2aac3e6559230885e3ca2109de108be6d648c3e074d3fe9.wasm",
"tx_init_account.wasm": "tx_init_account.8687af67a168e7f9c9f50c31ea2b95153807034f422fe0841c9a8a3e1201968a.wasm",
"tx_init_proposal.wasm": "tx_init_proposal.531b9f31a7a875de7f8cfcace9f5aa57569ca9bb7df02c230b1c9556d934eb15.wasm",
"tx_init_validator.wasm": "tx_init_validator.8709e98c316f1b669a0b57e21a6a0ccbf61f3aa9f9ecf0c8e050b8967d4836f5.wasm",
"tx_transfer.wasm": "tx_transfer.eee322423d44b295bae9cce9cbeae4beea233924c6ab89de458a950fca7b99dd.wasm",
"tx_unbond.wasm": "tx_unbond.178ad4e759750b1973cd9a28f4b97ba137cd7f2743bde6d7f2bda471134b9f30.wasm",
"tx_bond.wasm": "tx_bond.f77faad6612af7ef66024648813df9f7f9abc848f8d7a2733937744159fa0b7c.wasm",
"tx_ibc.wasm": "tx_ibc.1f88c957d2d16bd57095426d2ff0b2064361647eb70ef0444bcfc97ce74ded96.wasm",
"tx_init_account.wasm": "tx_init_account.23a09d0ca8d89a006a130f216e18743f45e47581c0b060f3bc413e2760b2efe4.wasm",
"tx_init_proposal.wasm": "tx_init_proposal.adecba9c9060481c07140509be3dfb7aae02ea789984d6395833cec1c1d382f8.wasm",
"tx_init_validator.wasm": "tx_init_validator.6d32c3a4a0ac8e75403ea1f74d2a2b8c0d434fc99f5556928dc96cd8d7ccf132.wasm",
"tx_transfer.wasm": "tx_transfer.23b992f95f9b789bbe22c7a5164b523858de7225b29f933b3872e20d94805bf5.wasm",
"tx_unbond.wasm": "tx_unbond.3e79d5ce863974999d4b25e034eda102d6a75d17b7b2984b7e776d5eaa0259ea.wasm",
"tx_update_vp.wasm": "tx_update_vp.12fa166b59971d3591df215e6835e86dda93eb41b2932a7badce2028c0a7d999.wasm",
"tx_vote_proposal.wasm": "tx_vote_proposal.d8b93da90ea98c12dbd659854ef7474f26d0975ae6d3bb77bfeebd7b324c9be0.wasm",
"tx_withdraw.wasm": "tx_withdraw.2e3d410eeacdeb7c45c73098c931356759acccda7d582ebefa707ae89f6283a8.wasm",
"vp_testnet_faucet.wasm": "vp_testnet_faucet.56a5cb3a0317f230261ee5efe3156dbc1f780349e1d9f1efa89f44d00935aea9.wasm",
"vp_token.wasm": "vp_token.f1a50fe691f3cdfbb54debb090bb0f2dcac866aa646909108267394b5ebd91dd.wasm",
"vp_user.wasm": "vp_user.d8d92923f050c93774fb5f02deaf8f8bbe0ea7d3ab9da8caab87bc3123da8531.wasm"
"tx_vote_proposal.wasm": "tx_vote_proposal.3ceb091ad87aa88ea680d9dd0abcc8a5cbfea8bb9e7afaaab38ff1c302f4e794.wasm",
"tx_withdraw.wasm": "tx_withdraw.999bd34ef7844ffbc450126165afb4e94d12caf6955ff048693d3b76d8d73145.wasm",
"vp_testnet_faucet.wasm": "vp_testnet_faucet.e8d79d6c010a7d779d7dced7b487e98b63d9bc4547ca930c4c02bdbca257c208.wasm",
"vp_token.wasm": "vp_token.587a92109e08400d3753f6794cf474977672d2fd30edb9d97592efa1460a9967.wasm",
"vp_user.wasm": "vp_user.077697d804835c5271c7ccf8b27141825556e4de9155a082dfc5e3984f06dff8.wasm"
}
8 changes: 4 additions & 4 deletions wasm_for_tests/wasm_source/Cargo.lock
View file

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

8 changes: 4 additions & 4 deletions wasm_for_tests/wasm_source/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ borsh-derive = {git = "https://github.com/heliaxdev/borsh-rs.git", rev = "cd5223
borsh-derive-internal = {git = "https://github.com/heliaxdev/borsh-rs.git", rev = "cd5223e5103c4f139e0c54cf8259b7ec5ec4073a"}
borsh-schema-derive-internal = {git = "https://github.com/heliaxdev/borsh-rs.git", rev = "cd5223e5103c4f139e0c54cf8259b7ec5ec4073a"}
# patched to a commit on the `eth-bridge-integration` branch of our fork
tendermint = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "87be41b8c9cc2850830f4d8028c1fe1bd9f96284"}
tendermint-proto = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "87be41b8c9cc2850830f4d8028c1fe1bd9f96284"}
tendermint-testgen = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "87be41b8c9cc2850830f4d8028c1fe1bd9f96284"}
tendermint-light-client-verifier = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "87be41b8c9cc2850830f4d8028c1fe1bd9f96284"}
tendermint = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "e6c684731f21bffd89886d3e91074b96aee074ba"}
tendermint-proto = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "e6c684731f21bffd89886d3e91074b96aee074ba"}
tendermint-testgen = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "e6c684731f21bffd89886d3e91074b96aee074ba"}
tendermint-light-client-verifier = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "e6c684731f21bffd89886d3e91074b96aee074ba"}

# patched to a commit on the `eth-bridge-integration` branch of our fork
ibc = {git = "https://github.com/heliaxdev/ibc-rs.git", rev = "f4703dfe2c1f25cc431279ab74f10f3e0f6827e2"}
Expand Down

0 comments on commit ff947e8

Please sign in to comment.