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

chore: Cherry-pick DeductFeeDecorator changes for upgrade-14 #9062

Merged
merged 5 commits into from
Mar 11, 2024

Conversation

gibson042
Copy link
Member

@gibson042 gibson042 commented Mar 11, 2024

Ref #9051

Description

Constructed from the following rebase-todo:

# Pull request #9051
# fix: eliminate fee double-charge by using configurable decorator
label dev-upgrade-14
# Merge conflict in go.mod; resolve by modifying HEAD:
# - github.com/cosmos/cosmos-sdk => github.com/agoric-labs/cosmos-sdk v0.46.16-alpha.agoric.2
# + github.com/cosmos/cosmos-sdk => github.com/agoric-labs/cosmos-sdk v0.46.16-alpha.agoric.2.1
pick 1ff7ea7da fix: eliminate fee double-charge by using configurable decorator
# Merge conflict; resolve by accepting deletion of golang/cosmos/ante/fee.go
pick 1b12c7e36 chore: remove unused decorator
# Ignore changes to file that is not in dev-upgrade-14.
# pick 1f75fd802 test(a3p): make some shell escaping more robust
# Merge conflict; resolve by moving a3p-integration/proposals/a:upgrade-14/ante-fees.test.js
# to a3p-integration/proposals/a:upgrade-14/
pick 2551258f2 test(a3p): e2e validation of once-only fee deduction
pick 9ac622211 docs: comment cleanup
label gh-9051
reset dev-upgrade-14
merge -C 177a8d099 gh-9051 # Merge pull request #9051 from Agoric/9036-antefix-cosmos

@gibson042 gibson042 added the force:integration Force integration tests to run on PR label Mar 11, 2024
@JimLarson
Copy link
Contributor

That's odd - I see golang/cosmos/ante/fee.go in dev-upgrade-14: https://github.com/Agoric/agoric-sdk/tree/dev-upgrade-14/golang/cosmos/ante

@gibson042 gibson042 force-pushed the gibson-upgrade-14-rc1-cherry-pick-antefix branch from 5605892 to 9c0255b Compare March 11, 2024 21:52
@gibson042 gibson042 merged commit 6f4d246 into dev-upgrade-14 Mar 11, 2024
64 checks passed
@gibson042 gibson042 deleted the gibson-upgrade-14-rc1-cherry-pick-antefix branch March 11, 2024 23:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
force:integration Force integration tests to run on PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants