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

fix: Blackberry Security Fix #135

Merged
merged 28 commits into from
Aug 21, 2024
Merged

fix: Blackberry Security Fix #135

merged 28 commits into from
Aug 21, 2024

Conversation

aljo242
Copy link
Collaborator

@aljo242 aljo242 commented Aug 21, 2024

No description provided.

@aljo242 aljo242 requested a review from Eric-Warehime as a code owner August 21, 2024 09:25
@aljo242 aljo242 requested a review from bpiv400 August 21, 2024 09:27
@aljo242 aljo242 self-assigned this Aug 21, 2024
@aljo242 aljo242 merged commit 1aac4a6 into main Aug 21, 2024
9 checks passed
@aljo242 aljo242 deleted the feat/pre-deduct branch August 21, 2024 09:38
mergify bot pushed a commit that referenced this pull request Aug 21, 2024
* escrwo

* utd:

* bettington

* yay

* ok

* version

* ok

* fixing

* testing working

* fix

* add comment

* alwasy escrow

* test

* add checks

* comment

* adding test

* format

* clean

* remove escrow acct

* update comment

* ok

* test

* add StateUpdate field

* test - disabled -> enabled

* ok

* use the keeer for enabled height

* return -1 when nothing in state

(cherry picked from commit 1aac4a6)

# Conflicts:
#	go.mod
#	go.sum
#	tests/app/app.go
#	tests/app/feemarketd/cmd/commands.go
#	tests/e2e/setup.go
#	x/feemarket/ante/expected_keepers.go
#	x/feemarket/ante/feegrant_test.go
#	x/feemarket/ante/suite/suite.go
#	x/feemarket/keeper/keeper.go
#	x/feemarket/keeper/keeper_test.go
#	x/feemarket/post/expected_keeper.go
#	x/feemarket/post/fee.go
#	x/feemarket/post/fee_test.go
#	x/feemarket/post/mocks/mock_feegrant_keeper.go
@aljo242 aljo242 changed the title feat: pre deduct funds fix: Blackberry Security Fix Aug 21, 2024
aljo242 added a commit that referenced this pull request Aug 22, 2024
* feat: pre deduct funds (#135)

* escrwo

* utd:

* bettington

* yay

* ok

* version

* ok

* fixing

* testing working

* fix

* add comment

* alwasy escrow

* test

* add checks

* comment

* adding test

* format

* clean

* remove escrow acct

* update comment

* ok

* test

* add StateUpdate field

* test - disabled -> enabled

* ok

* use the keeer for enabled height

* return -1 when nothing in state

(cherry picked from commit 1aac4a6)

# Conflicts:
#	go.mod
#	go.sum
#	tests/app/app.go
#	tests/app/feemarketd/cmd/commands.go
#	tests/e2e/setup.go
#	x/feemarket/ante/expected_keepers.go
#	x/feemarket/ante/feegrant_test.go
#	x/feemarket/ante/suite/suite.go
#	x/feemarket/keeper/keeper.go
#	x/feemarket/keeper/keeper_test.go
#	x/feemarket/post/expected_keeper.go
#	x/feemarket/post/fee.go
#	x/feemarket/post/fee_test.go
#	x/feemarket/post/mocks/mock_feegrant_keeper.go

* fixing

* wip

* test

* tidy

* remove dead file

* fix

---------

Co-authored-by: Alex Johnson <alex@skip.money>
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