Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
cb87de9
rework fees
ethanoroshiba Sep 19, 2024
5662ba1
rustfmt
ethanoroshiba Sep 19, 2024
4db8306
remove manual testing code
ethanoroshiba Sep 19, 2024
34c3cf0
rustfmt
ethanoroshiba Sep 19, 2024
1b5825e
Minor improvements and verbage changes
ethanoroshiba Sep 19, 2024
aa2c9ff
Fix warning
ethanoroshiba Sep 19, 2024
a5363ec
Merge branch 'main' into ENG-718/rework_fees_again
ethanoroshiba Sep 26, 2024
2d97105
Merge branch 'main' into ENG-718/rework_fees_again
ethanoroshiba Sep 30, 2024
f55673c
remove allow attributes
ethanoroshiba Sep 30, 2024
e84060e
Merge branch 'main' into ENG-718/rework_fees_again
ethanoroshiba Oct 1, 2024
747c6be
rustfmt
ethanoroshiba Oct 2, 2024
d69191a
requested changes
ethanoroshiba Oct 2, 2024
4c44f11
rework all fees
ethanoroshiba Oct 8, 2024
d8f2a2f
Merge branch 'main' into ENG-718/rework_fees_again
ethanoroshiba Oct 8, 2024
ddad564
Merge branch 'ENG-718/rework_fees_again' into eoroshiba/fee_finalization
ethanoroshiba Oct 8, 2024
4e35ad8
couple minor fixes. todo: make state reads/writes type safe
ethanoroshiba Oct 8, 2024
864bf0c
make reads/writes type safe
ethanoroshiba Oct 9, 2024
a7c3656
more changes
ethanoroshiba Oct 9, 2024
cbb32c4
flattened fee components inner into all the fee types
SuperFluffy Oct 9, 2024
0be4bf2
changes to sequencer after previous commit
ethanoroshiba Oct 9, 2024
b86bf58
fix weird merge
ethanoroshiba Oct 9, 2024
a89da98
Merge branch 'ENG-718/rework_fees_again' into eoroshiba/fee_finalization
ethanoroshiba Oct 9, 2024
7d59623
various minor updates to fee-handling
Fraser999 Oct 10, 2024
82a8e83
avoid cloning when calculating base deposit fee
Fraser999 Oct 10, 2024
54f9bbf
requested changes
ethanoroshiba Oct 11, 2024
6d02adf
small changes
ethanoroshiba Oct 11, 2024
9f1f071
various renames
Fraser999 Oct 11, 2024
d4a2955
requested changes
ethanoroshiba Oct 15, 2024
fd45f49
Merge branch 'main' into eoroshiba/fee_finalization
ethanoroshiba Oct 15, 2024
bbd430e
make snapshots separate in fees component
ethanoroshiba Oct 15, 2024
a01cee9
Snapshots
ethanoroshiba Oct 15, 2024
6ddbac8
requested changes
ethanoroshiba Oct 15, 2024
4f47cbf
Requested change
ethanoroshiba Oct 15, 2024
72f8cd5
Key changes
ethanoroshiba Oct 15, 2024
2afdea2
genesis changes
ethanoroshiba Oct 15, 2024
1640c2b
More genesis updates
ethanoroshiba Oct 15, 2024
a34e85d
Add missing fees to genesis
ethanoroshiba Oct 15, 2024
e454ccc
revert devtag
ethanoroshiba Oct 15, 2024
661f116
requested change
ethanoroshiba Oct 15, 2024
e5e01f7
Suggestion from joroshiba
ethanoroshiba Oct 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions charts/sequencer/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.23.2
version: 0.24.0
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "0.17.0"
appVersion: "0.18.0"

dependencies:
- name: sequencer-relayer
Expand Down
73 changes: 66 additions & 7 deletions charts/sequencer/files/cometbft/config/genesis.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,72 @@
"app_state": {
"native_asset_base_denomination": "{{ .Values.genesis.nativeAssetBaseDenomination }}",
"fees": {
"transfer_base_fee": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.transferBaseFee }},
"sequence_base_fee": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.sequenceBaseFee }},
"sequence_byte_cost_multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.sequenceByteCostMultiplier }},
"init_bridge_account_base_fee": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.initBridgeAccountBaseFee }},
"bridge_lock_byte_cost_multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.bridgeLockByteCostMultiplier }},
"bridge_sudo_change_fee": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.bridgeSudoChangeFee }},
"ics20_withdrawal_base_fee": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.ics20WithdrawalBaseFee }}
{{- if not .Values.global.dev }}
"transfer_base_fee": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.transfer.base }},
"sequence_base_fee": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.sequence.base }},
"sequence_byte_cost_multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.sequence.multiplier }},
"init_bridge_account_base_fee": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.initBridgeAccount.base }},
"bridge_lock_byte_cost_multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.bridgeLock.multiplier }},
"bridge_sudo_change_fee": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.bridgeSudoChange.base }},
"ics20_withdrawal_base_fee": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.ics20Withdrawal.base }}
{{- else }}
"bridge_lock": {
"base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.bridgeLock.base }},
"multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.bridgeLock.multiplier }}
},
"bridge_sudo_change": {
"base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.bridgeSudoChange.base }},
"multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.bridgeSudoChange.multiplier }}
},
"bridge_unlock": {
"base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.bridgeUnlock.base }},
"multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.bridgeUnlock.multiplier }}
},
"fee_asset_change": {
"base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.feeAssetChange.base }},
"multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.feeAssetChange.multiplier }}
},
"fee_change": {
"base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.feeChange.base }},
"multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.feeChange.multiplier }}
},
"ibc_relay": {
"base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.ibcRelay.base }},
"multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.ibcRelay.multiplier }}
},
"ibc_relayer_change": {
"base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.ibcRelayerChange.base }},
"multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.ibcRelayerChange.multiplier }}
},
"ibc_sudo_change": {
"base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.ibcSudoChange.base }},
"multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.ibcSudoChange.multiplier }}
},
"ics20_withdrawal": {
"base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.ics20Withdrawal.base }},
"multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.ics20Withdrawal.multiplier }}
},
"init_bridge_account": {
"base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.initBridgeAccount.base }},
"multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.initBridgeAccount.multiplier }}
},
"sequence": {
"base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.sequence.base }},
"multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.sequence.multiplier }}
},
"sudo_address_change": {
"base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.sudoAddressChange.base }},
"multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.sudoAddressChange.multiplier }}
},
"transfer": {
"base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.transfer.base }},
"multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.transfer.multiplier }}
},
"validator_update": {
"base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.validatorUpdate.base }},
"multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.validatorUpdate.multiplier }}
}
{{- end }}
},
"allowed_fee_assets": [
{{- range $index, $value := .Values.genesis.allowedFeeAssets }}
Expand Down
51 changes: 43 additions & 8 deletions charts/sequencer/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ images:
sequencer:
repo: ghcr.io/astriaorg/sequencer
pullPolicy: IfNotPresent
tag: "0.17.0"
tag: "0.18.0"
devTag: latest

moniker: ""
Expand Down Expand Up @@ -56,13 +56,48 @@ genesis:
maxBytes: "1048576"

fees:
transferBaseFee: "12"
sequenceBaseFee: "32"
sequenceByteCostMultiplier: "1"
initBridgeAccountBaseFee: "48"
bridgeLockByteCostMultiplier: "1"
bridgeSudoChangeFee: "24"
ics20WithdrawalBaseFee: "24"
bridgeLock:
base: "0"
multiplier: "1"
bridgeSudoChange:
base: "24"
multiplier: "0"
bridgeUnlock:
base: "0"
multiplier: "0"
feeAssetChange:
base: "0"
multiplier: "0"
feeChange:
base: "0"
multiplier: "0"
ibcRelay:
base: "0"
multiplier: "0"
ibcRelayerChange:
base: "0"
multiplier: "0"
ibcSudoChange:
base: "0"
multiplier: "0"
ics20Withdrawal:
base: "24"
multiplier: "0"
initBridgeAccount:
base: "48"
multiplier: "0"
sequence:
base: "32"
multiplier: "1"
sudoAddressChange:
base: "0"
multiplier: "0"
transfer:
base: "12"
multiplier: "0"
validatorUpdate:
base: "0"
multiplier: "0"

validators: []
# - name: core
Expand Down
Loading