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.

Sign up for GitHub

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

Jump to bottom

feat(sequencer): make fees optional at genesis #1664

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+202 −169
Open

feat(sequencer): make fees optional at genesis #1664

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0792df7
make all fees except fee change optional at genesis
ethanoroshiba Oct 16, 2024
26cde5a
Merge branch 'main' into ENG-921/genesis_fees_optional
ethanoroshiba Oct 16, 2024
8b8df37
Merge branch 'main' into ENG-921/genesis_fees_optional
ethanoroshiba Oct 16, 2024
78a42db
`Merge branch 'main' into ENG-921/genesis_fees_optional
ethanoroshiba Oct 18, 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
217 changes: 113 additions & 104 deletions crates/astria-core/src/protocol/genesis/v1alpha1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,22 +558,25 @@ impl From<raw::IbcParameters> for IBCParameters {
}
}

/// Fees for all actions at genesis, which are all optional except for `fee_change`. If an action
/// has no associated fees, it will be assumed to be disabled until it is explicitly given fees
/// via the `FeeChange` action. Transactions with deactivated actions will fail upon execution.
#[derive(Clone, Debug)]
pub struct GenesisFees {
pub sequence: SequenceFeeComponents,
pub transfer: TransferFeeComponents,
pub ics20_withdrawal: Ics20WithdrawalFeeComponents,
pub init_bridge_account: InitBridgeAccountFeeComponents,
pub bridge_lock: BridgeLockFeeComponents,
pub bridge_unlock: BridgeUnlockFeeComponents,
pub bridge_sudo_change: BridgeSudoChangeFeeComponents,
pub ibc_relay: IbcRelayFeeComponents,
pub validator_update: ValidatorUpdateFeeComponents,
pub fee_asset_change: FeeAssetChangeFeeComponents,
pub sequence: Option<SequenceFeeComponents>,
pub transfer: Option<TransferFeeComponents>,
pub ics20_withdrawal: Option<Ics20WithdrawalFeeComponents>,
pub init_bridge_account: Option<InitBridgeAccountFeeComponents>,
pub bridge_lock: Option<BridgeLockFeeComponents>,
pub bridge_unlock: Option<BridgeUnlockFeeComponents>,
pub bridge_sudo_change: Option<BridgeSudoChangeFeeComponents>,
pub ibc_relay: Option<IbcRelayFeeComponents>,
pub validator_update: Option<ValidatorUpdateFeeComponents>,
pub fee_asset_change: Option<FeeAssetChangeFeeComponents>,
pub fee_change: FeeChangeFeeComponents,
pub ibc_relayer_change: IbcRelayerChangeFeeComponents,
pub sudo_address_change: SudoAddressChangeFeeComponents,
pub ibc_sudo_change: IbcSudoChangeFeeComponents,
pub ibc_relayer_change: Option<IbcRelayerChangeFeeComponents>,
pub sudo_address_change: Option<SudoAddressChangeFeeComponents>,
pub ibc_sudo_change: Option<IbcSudoChangeFeeComponents>,
}

impl Protobuf for GenesisFees {
Expand Down Expand Up @@ -601,90 +604,90 @@ impl Protobuf for GenesisFees {
sudo_address_change,
ibc_sudo_change,
} = raw;
let sequence = SequenceFeeComponents::try_from_raw(
sequence
.clone()
.ok_or_else(|| Self::Error::field_not_set("sequence"))?,
)
.map_err(|e| FeesError::fee_components("sequence", e))?;
let transfer = TransferFeeComponents::try_from_raw(
transfer
.clone()
.ok_or_else(|| Self::Error::field_not_set("transfer"))?,
)
.map_err(|e| FeesError::fee_components("transfer", e))?;
let ics20_withdrawal = Ics20WithdrawalFeeComponents::try_from_raw(
ics20_withdrawal
.clone()
.ok_or_else(|| Self::Error::field_not_set("ics20_withdrawal"))?,
)
.map_err(|e| FeesError::fee_components("ics20_withdrawal", e))?;
let init_bridge_account = InitBridgeAccountFeeComponents::try_from_raw(
init_bridge_account
.clone()
.ok_or_else(|| Self::Error::field_not_set("init_bridge_account"))?,
)
.map_err(|e| FeesError::fee_components("init_bridge_account", e))?;
let bridge_lock = BridgeLockFeeComponents::try_from_raw(
bridge_lock
.clone()
.ok_or_else(|| Self::Error::field_not_set("bridge_lock"))?,
)
.map_err(|e| FeesError::fee_components("bridge_lock", e))?;
let bridge_unlock = BridgeUnlockFeeComponents::try_from_raw(
bridge_unlock
.clone()
.ok_or_else(|| Self::Error::field_not_set("bridge_unlock"))?,
)
.map_err(|e| FeesError::fee_components("bridge_unlock", e))?;
let bridge_sudo_change = BridgeSudoChangeFeeComponents::try_from_raw(
bridge_sudo_change
.clone()
.ok_or_else(|| Self::Error::field_not_set("bridge_sudo_change"))?,
)
.map_err(|e| FeesError::fee_components("bridge_sudo_change", e))?;
let ibc_relay = IbcRelayFeeComponents::try_from_raw(
ibc_relay
.clone()
.ok_or_else(|| Self::Error::field_not_set("ibc_relay"))?,
)
.map_err(|e| FeesError::fee_components("ibc_relay", e))?;
let validator_update = ValidatorUpdateFeeComponents::try_from_raw(
validator_update
.clone()
.ok_or_else(|| Self::Error::field_not_set("validator_update"))?,
)
.map_err(|e| FeesError::fee_components("validator_update", e))?;
let fee_asset_change = FeeAssetChangeFeeComponents::try_from_raw(
fee_asset_change
.clone()
.ok_or_else(|| Self::Error::field_not_set("fee_asset_change"))?,
)
.map_err(|e| FeesError::fee_components("fee_asset_change", e))?;
let sequence = sequence
.clone()
.map(SequenceFeeComponents::try_from_raw)
.transpose()
.map_err(|e| FeesError::fee_components("sequence", e))?;

let transfer = transfer
.clone()
.map(TransferFeeComponents::try_from_raw)
.transpose()
.map_err(|e| FeesError::fee_components("transfer", e))?;

let ics20_withdrawal = ics20_withdrawal
.clone()
.map(Ics20WithdrawalFeeComponents::try_from_raw)
.transpose()
.map_err(|e| FeesError::fee_components("ics20_withdrawal", e))?;

let init_bridge_account = init_bridge_account
.clone()
.map(InitBridgeAccountFeeComponents::try_from_raw)
.transpose()
.map_err(|e| FeesError::fee_components("init_bridge_account", e))?;

let bridge_lock = bridge_lock
.clone()
.map(BridgeLockFeeComponents::try_from_raw)
.transpose()
.map_err(|e| FeesError::fee_components("bridge_lock", e))?;

let bridge_unlock = bridge_unlock
.clone()
.map(BridgeUnlockFeeComponents::try_from_raw)
.transpose()
.map_err(|e| FeesError::fee_components("bridge_unlock", e))?;

let bridge_sudo_change = bridge_sudo_change
.clone()
.map(BridgeSudoChangeFeeComponents::try_from_raw)
.transpose()
.map_err(|e| FeesError::fee_components("bridge_sudo_change", e))?;

let ibc_relay = ibc_relay
.clone()
.map(IbcRelayFeeComponents::try_from_raw)
.transpose()
.map_err(|e| FeesError::fee_components("ibc_relay", e))?;

let validator_update = validator_update
.clone()
.map(ValidatorUpdateFeeComponents::try_from_raw)
.transpose()
.map_err(|e| FeesError::fee_components("validator_update", e))?;

let fee_asset_change = fee_asset_change
.clone()
.map(FeeAssetChangeFeeComponents::try_from_raw)
.transpose()
.map_err(|e| FeesError::fee_components("fee_asset_change", e))?;

let fee_change = FeeChangeFeeComponents::try_from_raw(
fee_change
.clone()
.ok_or_else(|| Self::Error::field_not_set("fee_change"))?,
)
.map_err(|e| FeesError::fee_components("fee_change", e))?;
let ibc_relayer_change = IbcRelayerChangeFeeComponents::try_from_raw(
ibc_relayer_change
.clone()
.ok_or_else(|| Self::Error::field_not_set("ibc_relayer_change"))?,
)
.map_err(|e| FeesError::fee_components("ibc_relayer_change", e))?;
let sudo_address_change = SudoAddressChangeFeeComponents::try_from_raw(
sudo_address_change
.clone()
.ok_or_else(|| Self::Error::field_not_set("sudo_address_change"))?,
)
.map_err(|e| FeesError::fee_components("sudo_address_change", e))?;
let ibc_sudo_change = IbcSudoChangeFeeComponents::try_from_raw(
ibc_sudo_change
.clone()
.ok_or_else(|| Self::Error::field_not_set("ibc_sudo_change"))?,
)
.map_err(|e| FeesError::fee_components("ibc_sudo_change", e))?;

let ibc_relayer_change = ibc_relayer_change
.clone()
.map(IbcRelayerChangeFeeComponents::try_from_raw)
.transpose()
.map_err(|e| FeesError::fee_components("ibc_relayer_change", e))?;

let sudo_address_change = sudo_address_change
.clone()
.map(SudoAddressChangeFeeComponents::try_from_raw)
.transpose()
.map_err(|e| FeesError::fee_components("sudo_address_change", e))?;

let ibc_sudo_change = ibc_sudo_change
.clone()
.map(IbcSudoChangeFeeComponents::try_from_raw)
.transpose()
.map_err(|e| FeesError::fee_components("ibc_sudo_change", e))?;

Ok(Self {
sequence,
Expand Down Expand Up @@ -722,20 +725,26 @@ impl Protobuf for GenesisFees {
ibc_sudo_change,
} = self;
Self::Raw {
transfer: Some(transfer.to_raw()),
sequence: Some(sequence.to_raw()),
ics20_withdrawal: Some(ics20_withdrawal.to_raw()),
init_bridge_account: Some(init_bridge_account.to_raw()),
bridge_lock: Some(bridge_lock.to_raw()),
bridge_unlock: Some(bridge_unlock.to_raw()),
bridge_sudo_change: Some(bridge_sudo_change.to_raw()),
ibc_relay: Some(ibc_relay.to_raw()),
validator_update: Some(validator_update.to_raw()),
fee_asset_change: Some(fee_asset_change.to_raw()),
transfer: transfer.map(|act| TransferFeeComponents::to_raw(&act)),
sequence: sequence.map(|act| SequenceFeeComponents::to_raw(&act)),
ics20_withdrawal: ics20_withdrawal
.map(|act| Ics20WithdrawalFeeComponents::to_raw(&act)),
init_bridge_account: init_bridge_account
.map(|act| InitBridgeAccountFeeComponents::to_raw(&act)),
bridge_lock: bridge_lock.map(|act| BridgeLockFeeComponents::to_raw(&act)),
bridge_unlock: bridge_unlock.map(|act| BridgeUnlockFeeComponents::to_raw(&act)),
bridge_sudo_change: bridge_sudo_change
.map(|act| BridgeSudoChangeFeeComponents::to_raw(&act)),
ibc_relay: ibc_relay.map(|act| IbcRelayFeeComponents::to_raw(&act)),
validator_update: validator_update
.map(|act| ValidatorUpdateFeeComponents::to_raw(&act)),
fee_asset_change: fee_asset_change.map(|act| FeeAssetChangeFeeComponents::to_raw(&act)),
fee_change: Some(fee_change.to_raw()),
ibc_relayer_change: Some(ibc_relayer_change.to_raw()),
sudo_address_change: Some(sudo_address_change.to_raw()),
ibc_sudo_change: Some(ibc_sudo_change.to_raw()),
ibc_relayer_change: ibc_relayer_change
.map(|act| IbcRelayerChangeFeeComponents::to_raw(&act)),
sudo_address_change: sudo_address_change
.map(|act| SudoAddressChangeFeeComponents::to_raw(&act)),
ibc_sudo_change: ibc_sudo_change.map(|act| IbcSudoChangeFeeComponents::to_raw(&act)),
}
}
}
Expand Down
52 changes: 26 additions & 26 deletions crates/astria-sequencer/src/app/test_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,62 +182,62 @@ pub(crate) fn default_genesis_accounts() -> Vec<Account> {
#[cfg_attr(feature = "benchmark", allow(dead_code))]
pub(crate) fn default_fees() -> astria_core::protocol::genesis::v1alpha1::GenesisFees {
astria_core::protocol::genesis::v1alpha1::GenesisFees {
transfer: TransferFeeComponents {
transfer: Some(TransferFeeComponents {
base: 12,
multiplier: 0,
},
sequence: SequenceFeeComponents {
}),
sequence: Some(SequenceFeeComponents {
base: 32,
multiplier: 1,
},
init_bridge_account: InitBridgeAccountFeeComponents {
}),
init_bridge_account: Some(InitBridgeAccountFeeComponents {
base: 48,
multiplier: 0,
},
bridge_lock: BridgeLockFeeComponents {
}),
bridge_lock: Some(BridgeLockFeeComponents {
base: 12, // should reflect transfer fee
multiplier: 1,
},
bridge_sudo_change: BridgeSudoChangeFeeComponents {
}),
bridge_sudo_change: Some(BridgeSudoChangeFeeComponents {
base: 24,
multiplier: 0,
},
ics20_withdrawal: Ics20WithdrawalFeeComponents {
}),
ics20_withdrawal: Some(Ics20WithdrawalFeeComponents {
base: 24,
multiplier: 0,
},
bridge_unlock: BridgeUnlockFeeComponents {
}),
bridge_unlock: Some(BridgeUnlockFeeComponents {
base: 12, // should reflect transfer fee
multiplier: 0,
},
ibc_relay: IbcRelayFeeComponents {
}),
ibc_relay: Some(IbcRelayFeeComponents {
base: 0,
multiplier: 0,
},
validator_update: ValidatorUpdateFeeComponents {
}),
validator_update: Some(ValidatorUpdateFeeComponents {
base: 0,
multiplier: 0,
},
fee_asset_change: FeeAssetChangeFeeComponents {
}),
fee_asset_change: Some(FeeAssetChangeFeeComponents {
base: 0,
multiplier: 0,
},
}),
fee_change: FeeChangeFeeComponents {
base: 0,
multiplier: 0,
},
ibc_relayer_change: IbcRelayerChangeFeeComponents {
ibc_relayer_change: Some(IbcRelayerChangeFeeComponents {
base: 0,
multiplier: 0,
},
sudo_address_change: SudoAddressChangeFeeComponents {
}),
sudo_address_change: Some(SudoAddressChangeFeeComponents {
base: 0,
multiplier: 0,
},
ibc_sudo_change: IbcSudoChangeFeeComponents {
}),
ibc_sudo_change: Some(IbcSudoChangeFeeComponents {
base: 0,
multiplier: 0,
},
}),
}
}

Expand Down
Loading
Loading