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

Multi-era exts #298

Merged
merged 3 commits into from
Jan 30, 2024
Merged

Multi-era exts #298

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c574039
Multi-era dump exts
gostkin Jan 23, 2024
7e707a2
fix: cddl files with certs
gostkin Jan 29, 2024
9d211d8
fix: remove unnecessary comments
gostkin Jan 30, 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
4 changes: 2 additions & 2 deletions chain/rust/src/builders/certificate_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ pub fn cert_required_wits(cert: &Certificate, required_witnesses: &mut RequiredW
required_witnesses.add_vkey_key_hash(cert.pool_params.operator);
}
Certificate::PoolRetirement(cert) => {
required_witnesses.add_vkey_key_hash(cert.ed25519_key_hash);
required_witnesses.add_vkey_key_hash(cert.pool);
}
Certificate::RegCert(cert) => {
required_witnesses.add_from_credential(cert.stake_credential.clone());
Expand Down Expand Up @@ -114,7 +114,7 @@ pub fn add_cert_vkeys(
vkeys.insert(cert.pool_params.operator);
}
Certificate::PoolRetirement(cert) => {
vkeys.insert(cert.ed25519_key_hash);
vkeys.insert(cert.pool);
}
Certificate::RegCert(_cert) => {
// does not require a witness
Expand Down
10 changes: 5 additions & 5 deletions chain/rust/src/certs/cbor_encodings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ pub struct PoolRegistrationEncoding {
pub struct PoolRetirementEncoding {
pub len_encoding: LenEncoding,
pub tag_encoding: Option<cbor_event::Sz>,
pub ed25519_key_hash_encoding: StringEncoding,
pub pool_encoding: StringEncoding,
pub epoch_encoding: Option<cbor_event::Sz>,
}

Expand Down Expand Up @@ -100,7 +100,7 @@ pub struct SingleHostNameEncoding {
pub struct StakeDelegationEncoding {
pub len_encoding: LenEncoding,
pub tag_encoding: Option<cbor_event::Sz>,
pub ed25519_key_hash_encoding: StringEncoding,
pub pool_encoding: StringEncoding,
}

#[derive(Clone, Debug, Default)]
Expand All @@ -113,7 +113,7 @@ pub struct StakeDeregistrationEncoding {
pub struct StakeRegDelegCertEncoding {
pub len_encoding: LenEncoding,
pub tag_encoding: Option<cbor_event::Sz>,
pub ed25519_key_hash_encoding: StringEncoding,
pub pool_encoding: StringEncoding,
pub coin_encoding: Option<cbor_event::Sz>,
}

Expand All @@ -127,14 +127,14 @@ pub struct StakeRegistrationEncoding {
pub struct StakeVoteDelegCertEncoding {
pub len_encoding: LenEncoding,
pub tag_encoding: Option<cbor_event::Sz>,
pub ed25519_key_hash_encoding: StringEncoding,
pub pool_encoding: StringEncoding,
}

#[derive(Clone, Debug, Default)]
pub struct StakeVoteRegDelegCertEncoding {
pub len_encoding: LenEncoding,
pub tag_encoding: Option<cbor_event::Sz>,
pub ed25519_key_hash_encoding: StringEncoding,
pub pool_encoding: StringEncoding,
pub coin_encoding: Option<cbor_event::Sz>,
}

Expand Down
79 changes: 30 additions & 49 deletions chain/rust/src/certs/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,19 +78,16 @@ impl Certificate {
Self::StakeDeregistration(StakeDeregistration::new(stake_credential))
}

pub fn new_stake_delegation(
stake_credential: StakeCredential,
ed25519_key_hash: Ed25519KeyHash,
) -> Self {
Self::StakeDelegation(StakeDelegation::new(stake_credential, ed25519_key_hash))
pub fn new_stake_delegation(stake_credential: StakeCredential, pool: Ed25519KeyHash) -> Self {
Self::StakeDelegation(StakeDelegation::new(stake_credential, pool))
}

pub fn new_pool_registration(pool_params: PoolParams) -> Self {
Self::PoolRegistration(PoolRegistration::new(pool_params))
}

pub fn new_pool_retirement(ed25519_key_hash: Ed25519KeyHash, epoch: Epoch) -> Self {
Self::PoolRetirement(PoolRetirement::new(ed25519_key_hash, epoch))
pub fn new_pool_retirement(pool: Ed25519KeyHash, epoch: Epoch) -> Self {
Self::PoolRetirement(PoolRetirement::new(pool, epoch))
}

pub fn new_reg_cert(stake_credential: StakeCredential, coin: Coin) -> Self {
Expand All @@ -107,26 +104,18 @@ impl Certificate {

pub fn new_stake_vote_deleg_cert(
stake_credential: StakeCredential,
ed25519_key_hash: Ed25519KeyHash,
pool: Ed25519KeyHash,
d_rep: DRep,
) -> Self {
Self::StakeVoteDelegCert(StakeVoteDelegCert::new(
stake_credential,
ed25519_key_hash,
d_rep,
))
Self::StakeVoteDelegCert(StakeVoteDelegCert::new(stake_credential, pool, d_rep))
}

pub fn new_stake_reg_deleg_cert(
stake_credential: StakeCredential,
ed25519_key_hash: Ed25519KeyHash,
pool: Ed25519KeyHash,
coin: Coin,
) -> Self {
Self::StakeRegDelegCert(StakeRegDelegCert::new(
stake_credential,
ed25519_key_hash,
coin,
))
Self::StakeRegDelegCert(StakeRegDelegCert::new(stake_credential, pool, coin))
}

pub fn new_vote_reg_deleg_cert(
Expand All @@ -139,13 +128,13 @@ impl Certificate {

pub fn new_stake_vote_reg_deleg_cert(
stake_credential: StakeCredential,
ed25519_key_hash: Ed25519KeyHash,
pool: Ed25519KeyHash,
d_rep: DRep,
coin: Coin,
) -> Self {
Self::StakeVoteRegDelegCert(StakeVoteRegDelegCert::new(
stake_credential,
ed25519_key_hash,
pool,
d_rep,
coin,
))
Expand Down Expand Up @@ -278,13 +267,13 @@ impl Credential {
#[derive(Clone, Debug, serde::Deserialize, serde::Serialize, schemars::JsonSchema)]
pub enum DRep {
Key {
ed25519_key_hash: Ed25519KeyHash,
pool: Ed25519KeyHash,
#[serde(skip)]
len_encoding: LenEncoding,
#[serde(skip)]
index_0_encoding: Option<cbor_event::Sz>,
#[serde(skip)]
ed25519_key_hash_encoding: StringEncoding,
pool_encoding: StringEncoding,
},
Script {
script_hash: ScriptHash,
Expand All @@ -310,12 +299,12 @@ pub enum DRep {
}

impl DRep {
pub fn new_key(ed25519_key_hash: Ed25519KeyHash) -> Self {
pub fn new_key(pool: Ed25519KeyHash) -> Self {
Self::Key {
ed25519_key_hash,
pool,
len_encoding: LenEncoding::default(),
index_0_encoding: None,
ed25519_key_hash_encoding: StringEncoding::default(),
pool_encoding: StringEncoding::default(),
}
}

Expand Down Expand Up @@ -566,16 +555,16 @@ impl PoolRegistration {

#[derive(Clone, Debug, serde::Deserialize, serde::Serialize, schemars::JsonSchema)]
pub struct PoolRetirement {
pub ed25519_key_hash: Ed25519KeyHash,
pub pool: Ed25519KeyHash,
pub epoch: Epoch,
#[serde(skip)]
pub encodings: Option<PoolRetirementEncoding>,
}

impl PoolRetirement {
pub fn new(ed25519_key_hash: Ed25519KeyHash, epoch: Epoch) -> Self {
pub fn new(pool: Ed25519KeyHash, epoch: Epoch) -> Self {
Self {
ed25519_key_hash,
pool,
epoch,
encodings: None,
}
Expand Down Expand Up @@ -704,16 +693,16 @@ pub type StakeCredential = Credential;
#[derive(Clone, Debug, serde::Deserialize, serde::Serialize, schemars::JsonSchema)]
pub struct StakeDelegation {
pub stake_credential: StakeCredential,
pub ed25519_key_hash: Ed25519KeyHash,
pub pool: Ed25519KeyHash,
#[serde(skip)]
pub encodings: Option<StakeDelegationEncoding>,
}

impl StakeDelegation {
pub fn new(stake_credential: StakeCredential, ed25519_key_hash: Ed25519KeyHash) -> Self {
pub fn new(stake_credential: StakeCredential, pool: Ed25519KeyHash) -> Self {
Self {
stake_credential,
ed25519_key_hash,
pool,
encodings: None,
}
}
Expand All @@ -738,21 +727,17 @@ impl StakeDeregistration {
#[derive(Clone, Debug, serde::Deserialize, serde::Serialize, schemars::JsonSchema)]
pub struct StakeRegDelegCert {
pub stake_credential: StakeCredential,
pub ed25519_key_hash: Ed25519KeyHash,
pub pool: Ed25519KeyHash,
pub coin: Coin,
#[serde(skip)]
pub encodings: Option<StakeRegDelegCertEncoding>,
}

impl StakeRegDelegCert {
pub fn new(
stake_credential: StakeCredential,
ed25519_key_hash: Ed25519KeyHash,
coin: Coin,
) -> Self {
pub fn new(stake_credential: StakeCredential, pool: Ed25519KeyHash, coin: Coin) -> Self {
Self {
stake_credential,
ed25519_key_hash,
pool,
coin,
encodings: None,
}
Expand All @@ -778,21 +763,17 @@ impl StakeRegistration {
#[derive(Clone, Debug, serde::Deserialize, serde::Serialize, schemars::JsonSchema)]
pub struct StakeVoteDelegCert {
pub stake_credential: StakeCredential,
pub ed25519_key_hash: Ed25519KeyHash,
pub pool: Ed25519KeyHash,
pub d_rep: DRep,
#[serde(skip)]
pub encodings: Option<StakeVoteDelegCertEncoding>,
}

impl StakeVoteDelegCert {
pub fn new(
stake_credential: StakeCredential,
ed25519_key_hash: Ed25519KeyHash,
d_rep: DRep,
) -> Self {
pub fn new(stake_credential: StakeCredential, pool: Ed25519KeyHash, d_rep: DRep) -> Self {
Self {
stake_credential,
ed25519_key_hash,
pool,
d_rep,
encodings: None,
}
Expand All @@ -802,7 +783,7 @@ impl StakeVoteDelegCert {
#[derive(Clone, Debug, serde::Deserialize, serde::Serialize, schemars::JsonSchema)]
pub struct StakeVoteRegDelegCert {
pub stake_credential: StakeCredential,
pub ed25519_key_hash: Ed25519KeyHash,
pub pool: Ed25519KeyHash,
pub d_rep: DRep,
pub coin: Coin,
#[serde(skip)]
Expand All @@ -812,13 +793,13 @@ pub struct StakeVoteRegDelegCert {
impl StakeVoteRegDelegCert {
pub fn new(
stake_credential: StakeCredential,
ed25519_key_hash: Ed25519KeyHash,
pool: Ed25519KeyHash,
d_rep: DRep,
coin: Coin,
) -> Self {
Self {
stake_credential,
ed25519_key_hash,
pool,
d_rep,
coin,
encodings: None,
Expand Down
Loading
Loading