Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
57 changes: 57 additions & 0 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ members = [
"parameters",
"transactions",
"test_helpers",
"utilities"
]

[workspace.package]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- This file should undo anything in `up.sql`
SELECT 1;
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-- Your SQL goes here
ALTER TYPE TRANSACTION_KIND ADD VALUE 'init_account';
ALTER TYPE TRANSACTION_KIND ADD VALUE 'change_consensus_key';
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- This file should undo anything in `up.sql`
SELECT 1;

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions orm/src/transactions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ pub enum TransactionKindDb {
ReactivateValidator,
DeactivateValidator,
UnjailValidator,
ChangeConsensusKey,
InitAccount,
Unknown,
}

Expand All @@ -48,6 +50,8 @@ impl From<TransactionKind> for TransactionKindDb {
TransactionKind::UnshieldingTransfer(_) => {
Self::UnshieldingTransfer
}
TransactionKind::InitAccount(_) => Self::InitAccount,
TransactionKind::ChangeConsensusKey(_) => Self::ChangeConsensusKey,
TransactionKind::ShieldingTransfer(_) => Self::ShieldingTransfer,
TransactionKind::MixedTransfer(_) => Self::MixedTransfer,
TransactionKind::IbcMsg(_) => Self::IbcMsgTransfer,
Expand Down
20 changes: 17 additions & 3 deletions shared/src/block.rs
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,6 @@ impl Block {
vec![]
}
}
// IbcMsg is only used for non-transfer ibc packets
TransactionKind::IbcMsg(_) => vec![],
TransactionKind::IbcTrasparentTransfer((_, transfer))
| TransactionKind::IbcShieldingTransfer((_, transfer))
| TransactionKind::IbcUnshieldingTransfer((_, transfer)) => {
Expand Down Expand Up @@ -389,7 +387,21 @@ impl Block {
vec![]
}
}
TransactionKind::Unknown(_) => vec![],
TransactionKind::ChangeConsensusKey(data) => {
if let Some(data) = data {
let change_consensus_key_data = data.clone();

vec![TransactionTarget::sent(
tx.tx_id,
change_consensus_key_data.validator.to_string(),
)]
} else {
vec![]
}
}
TransactionKind::IbcMsg(_)
| TransactionKind::InitAccount(_)
| TransactionKind::Unknown(_) => vec![],
})
.collect::<HashSet<_>>()
}
Expand Down Expand Up @@ -836,6 +848,8 @@ impl Block {
)]
}
TransactionKind::Redelegation(_)
| TransactionKind::ChangeConsensusKey(_)
| TransactionKind::InitAccount(_)
| TransactionKind::CommissionChange(_)
| TransactionKind::RevealPk(_)
| TransactionKind::DeactivateValidator(_)
Expand Down
27 changes: 24 additions & 3 deletions shared/src/transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ use std::fmt::Display;
use anyhow::Context;
use bigdecimal::BigDecimal;
use namada_governance::{InitProposalData, VoteProposalData};
use namada_sdk::account::InitAccount;
use namada_sdk::address::Address;
use namada_sdk::borsh::BorshDeserialize;
use namada_sdk::key::common::PublicKey;
use namada_sdk::token::Transfer;
use namada_sdk::uint::Uint;
use namada_tx::data::pos::{
BecomeValidator, Bond, ClaimRewards, CommissionChange, MetaDataChange,
Redelegation, Unbond, Withdraw,
BecomeValidator, Bond, ClaimRewards, CommissionChange, ConsensusKeyChange,
MetaDataChange, Redelegation, Unbond, Withdraw,
};
use namada_tx::data::{TxType, compute_inner_tx_hash};
use namada_tx::either::Either;
Expand Down Expand Up @@ -86,13 +87,15 @@ pub enum TransactionKind {
ClaimRewards(Option<ClaimRewards>),
ProposalVote(Option<VoteProposalData>),
InitProposal(Option<InitProposalData>),
InitAccount(Option<InitAccount>),
MetadataChange(Option<MetaDataChange>),
CommissionChange(Option<CommissionChange>),
RevealPk(Option<RevealPkData>),
BecomeValidator(Option<Box<BecomeValidator>>),
ReactivateValidator(Option<Address>),
DeactivateValidator(Option<Address>),
UnjailValidator(Option<Address>),
ChangeConsensusKey(Option<ConsensusKeyChange>),
Unknown(Option<UnknownTransaction>),
}

Expand Down Expand Up @@ -170,6 +173,14 @@ impl TransactionKind {
};
TransactionKind::InitProposal(data)
}
"tx_init_account" => {
let data = if let Ok(data) = InitAccount::try_from_slice(data) {
Some(data)
} else {
None
};
TransactionKind::InitAccount(data)
}
"tx_vote_proposal" => {
let data =
if let Ok(data) = VoteProposalData::try_from_slice(data) {
Expand All @@ -188,7 +199,7 @@ impl TransactionKind {
};
TransactionKind::MetadataChange(data)
}
"tx_commission_change" => {
"tx_change_validator_commission" => {
let data =
if let Ok(data) = CommissionChange::try_from_slice(data) {
Some(data)
Expand Down Expand Up @@ -248,6 +259,16 @@ impl TransactionKind {
};
TransactionKind::BecomeValidator(data.map(Box::new))
}
"tx_change_consensus_key" => {
let data = if let Ok(data) =
ConsensusKeyChange::try_from_slice(data)
{
Some(data)
} else {
None
};
TransactionKind::ChangeConsensusKey(data)
}
_ => {
tracing::warn!("Unknown transaction kind: {}", tx_kind_name);
TransactionKind::Unknown(Some(UnknownTransaction {
Expand Down
4 changes: 3 additions & 1 deletion transactions/src/services/tx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,9 @@ pub fn get_gas_estimates(
let notes = tx.notes;
gas_estimate.increase_ibc_unshielding_transfer(notes)
}
TransactionKind::IbcMsg(_)
TransactionKind::ChangeConsensusKey(_)
| TransactionKind::IbcMsg(_)
| TransactionKind::InitAccount(_)
| TransactionKind::InitProposal(_)
| TransactionKind::MetadataChange(_)
| TransactionKind::CommissionChange(_)
Expand Down
48 changes: 48 additions & 0 deletions utilities/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
[package]
name = "utility"
description = "Namada utility functions."
resolver = "2"
authors.workspace = true
edition.workspace = true
license.workspace = true
readme.workspace = true
version.workspace = true

[[bin]]
name = "fix"
path = "src/main.rs"

[features]
production = []

[dependencies]
csv = "1.1"
axum.workspace = true
chrono.workspace = true
tokio.workspace = true
tower.workspace = true
tower-http.workspace = true
tracing.workspace = true
serde.workspace = true
serde_json.workspace = true
clap.workspace = true
anyhow.workspace = true
thiserror.workspace = true
lazy_static.workspace = true
deadpool-diesel.workspace = true
validator.workspace = true
axum-macros.workspace = true
axum-extra.workspace = true
orm.workspace = true
diesel.workspace = true
futures.workspace = true
tokio-stream.workspace = true
namada_core.workspace = true
namada_sdk.workspace = true
deadpool-redis = { workspace = true }
bigdecimal.workspace = true
shared.workspace = true
strum.workspace = true
axum-prometheus = { workspace = true }
sha256.workspace = true
subtle-encoding.workspace = true
Loading
Loading