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: simplify feemarket based on AIMD paper (backport #94) #98

Merged
merged 5 commits into from
Jun 4, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 4, 2024

  • remove targetUtilization param (always 0.5 * maxUtilization)
  • rename theta -> gamma
  • set proper bounds on parameters

https://arxiv.org/pdf/2110.04753


This is an automatic backport of pull request #94 done by Mergify.

* rename properly and add bounds

* format proto

* refactor

* tip fe

* bye target

* func

* fix

* params

* ante

* bet

* fix all

(cherry picked from commit 7b6193a)

# Conflicts:
#	tests/e2e/go.mod
#	tests/e2e/go.sum
#	tests/e2e/setup.go
#	tests/integration/integration_test.go
#	x/feemarket/ante/expected_keepers.go
#	x/feemarket/ante/suite/suite.go
@mergify mergify bot added the conflicts label Jun 4, 2024
Copy link
Author

mergify bot commented Jun 4, 2024

Cherry-pick of 7b6193a has failed:

On branch mergify/bp/sdk-47/pr-94
Your branch is up to date with 'origin/sdk-47'.

You are currently cherry-picking commit 7b6193a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   api/feemarket/feemarket/v1/genesis.pulsar.go
	modified:   api/feemarket/feemarket/v1/params.pulsar.go
	modified:   api/feemarket/feemarket/v1/query.pulsar.go
	modified:   api/feemarket/feemarket/v1/query_grpc.pb.go
	modified:   api/feemarket/feemarket/v1/tx_grpc.pb.go
	modified:   docs/SPEC.md
	modified:   proto/feemarket/feemarket/v1/genesis.proto
	modified:   proto/feemarket/feemarket/v1/params.proto
	modified:   proto/feemarket/feemarket/v1/query.proto
	modified:   tests/e2e/consumer.go
	modified:   tests/e2e/e2e_test.go
	modified:   tests/e2e/suite.go
	modified:   x/feemarket/ante/fee.go
	modified:   x/feemarket/fuzz/aimd_eip1559_test.go
	modified:   x/feemarket/fuzz/eip1559_test.go
	modified:   x/feemarket/keeper/feemarket_test.go
	modified:   x/feemarket/keeper/keeper_test.go
	modified:   x/feemarket/keeper/query_server_test.go
	modified:   x/feemarket/types/eip1559.go
	modified:   x/feemarket/types/eip1559_aimd.go
	modified:   x/feemarket/types/genesis.pb.go
	modified:   x/feemarket/types/params.go
	modified:   x/feemarket/types/params.pb.go
	modified:   x/feemarket/types/params_test.go
	modified:   x/feemarket/types/state.go
	modified:   x/feemarket/types/state_fuzz_test.go
	modified:   x/feemarket/types/state_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tests/e2e/go.mod
	both modified:   tests/e2e/go.sum
	both modified:   tests/e2e/setup.go
	both modified:   tests/integration/integration_test.go
	both modified:   x/feemarket/ante/expected_keepers.go
	both modified:   x/feemarket/ante/suite/suite.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested a review from Eric-Warehime as a code owner June 4, 2024 14:47
@aljo242 aljo242 merged commit 830ad5f into sdk-47 Jun 4, 2024
8 checks passed
@aljo242 aljo242 deleted the mergify/bp/sdk-47/pr-94 branch June 4, 2024 15:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant