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

(temporary) try out merging PR#754 for v0.11.0 #830

Closed
wants to merge 11 commits into from

Conversation

james-chf
Copy link
Contributor

@james-chf james-chf commented Nov 28, 2022

This PR is just to try out integrating #754 into the draft for v0.11 (#793), and can be closed once #754 is merged

juped and others added 10 commits November 21, 2022 13:48
* james/mainline/fix-abcipp:
  Fix up for namada v0.10.1
  Add changelog
  Add check-abcipp command
  Use ferveo-tpke flag to stop tendermint-rpc being pulled into wasm
  First attempt at fixing shared abcipp
  Namada 0.10.1

# Conflicts:
#	Makefile
#	core/src/proto/types.rs
#	shared/src/ledger/queries/mod.rs
#	shared/src/ledger/queries/shell.rs
#	shared/src/ledger/queries/types.rs
#	shared/src/lib.rs
#	wasm/checksums.json
#	wasm_for_tests/tx_memory_limit.wasm
#	wasm_for_tests/tx_mint_tokens.wasm
#	wasm_for_tests/tx_proposal_code.wasm
#	wasm_for_tests/tx_read_storage_key.wasm
#	wasm_for_tests/tx_write_storage_key.wasm
#	wasm_for_tests/vp_always_false.wasm
#	wasm_for_tests/vp_always_true.wasm
#	wasm_for_tests/vp_eval.wasm
#	wasm_for_tests/vp_memory_limit.wasm
#	wasm_for_tests/vp_read_storage_key.wasm
@james-chf james-chf changed the title Try out merging PR#754 into draft Try out merging PR#754 for v0.11.0 Nov 28, 2022
@james-chf james-chf changed the title Try out merging PR#754 for v0.11.0 (temporary) try out merging PR#754 for v0.11.0 Nov 28, 2022
@juped
Copy link
Member

juped commented Nov 30, 2022

#754 is merged

@juped juped closed this Nov 30, 2022
@james-chf james-chf deleted the james/draft/abcipp-fix branch November 30, 2022 18:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants