Skip to content

Commit

Permalink
Merge remote-tracking branches 'namada/ray/standardize-tm-version' (#614
Browse files Browse the repository at this point in the history
) and 'namada/tiago/main/shim-vext' (#510)

* namada/ray/standardize-tm-version:
  ci: standardize on one tendermint hash

* namada/tiago/main/shim-vext:
  build: pin abciplus library revisions
  wasm: update checksums.json
  Fix websockets and parsing of events returned from Tm
  Updated the lock file and fixed resulting issues. Tendermint currently won't start however
  Change the way we call Tendermint
  Add Cargo.lock changes
  Removed tm events log, put websocket back everywhere in client
  Remaining fixes
  Fix abcipp
  Add missing shell methods
  Fix abciplus
  Add Cargo.lock file diffs
  Find and replace Tendermint imports
  Add ConsensusParams import
  More fixes
  WIP: Shimming main
  Cargo lock nonsense
  Remove unused feature flag from Makefile
  WIP: Shimming main
  Shim queries
  Shim ProcessProposal
  Shim PrepareProposal
  WIP: Shimming main
  Add unit test filter to makefile targets
  WIP: Shimming main
  • Loading branch information
juped committed Oct 20, 2022
3 parents 81f57b9 + 9a830c0 + 23275d9 commit 36b7836
Show file tree
Hide file tree
Showing 40 changed files with 2,231 additions and 1,348 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:
cache_key: anoma
cache_version: v1
wait_for: anoma-release (ubuntu-latest, ABCI Release build, anoma-e2e-release, v1)
tendermint_artifact: tendermint-unreleased-559fb33ff9b27503ce7ac1c7d8589fe1d8b3e900
tendermint_artifact: tendermint-unreleased-ad825dcadbd4b98c3f91ce5a711e4fb36a69c377

env:
CARGO_INCREMENTAL: 0
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/build-tendermint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ jobs:
matrix:
os: [ubuntu-latest]
make:
- name: tendermint-unreleased
repository: heliaxdev/tendermint
tendermint_version: 559fb33ff9b27503ce7ac1c7d8589fe1d8b3e900
- name: tendermint-unreleased
repository: heliaxdev/tendermint
tendermint_version: ad825dcadbd4b98c3f91ce5a711e4fb36a69c377
Expand Down
Loading

0 comments on commit 36b7836

Please sign in to comment.