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

feat: expose deposit transaction hash from ingress-egress-tracker #5320

Merged
merged 4 commits into from
Oct 17, 2024
+32 −14
Merged

feat: expose deposit transaction hash from ingress-egress-tracker #5320

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8bb505a
feat: expose deposit transaction hash from ingress-egress-tracker [WE…
jerryafr Oct 8, 2024
e06bd8f
fixes
jerryafr Oct 15, 2024
01e0dd3
make deposit_details optional
jerryafr Oct 15, 2024
80c0e9a
fix tests
jerryafr Oct 16, 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
34 changes: 24 additions & 10 deletions api/bin/chainflip-ingress-egress-tracker/src/witnessing/state_chain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use crate::{
};
use cf_chains::{
address::ToHumanreadableAddress,
dot::PolkadotTransactionId,
dot::{PolkadotExtrinsicIndex, PolkadotTransactionId},
evm::{SchnorrVerificationComponents, H256},
AnyChain, Arbitrum, Bitcoin, Chain, Ethereum, Polkadot,
};
Expand Down Expand Up @@ -58,6 +58,15 @@ enum TransactionId {
Arbitrum { signature: SchnorrVerificationComponents },
}

#[derive(Serialize)]
#[serde(untagged)]
enum DepositDetails {
Bitcoin { tx_id: H256, vout: u32 },
Ethereum { tx_hashes: Option<Vec<H256>> },
jerryafr marked this conversation as resolved.
Show resolved Hide resolved
Polkadot { extrinsic_index: PolkadotExtrinsicIndex },
Arbitrum { tx_hashes: Option<Vec<H256>> },
}

#[derive(Serialize)]
#[serde(untagged)]
enum WitnessInformation {
Expand All @@ -67,6 +76,7 @@ enum WitnessInformation {
deposit_address: String,
amount: NumberOrHex,
asset: cf_chains::assets::any::Asset,
deposit_details: DepositDetails,
jerryafr marked this conversation as resolved.
Show resolved Hide resolved
},
Broadcast {
#[serde(skip_serializing)]
Expand Down Expand Up @@ -121,6 +131,9 @@ impl From<DepositInfo<Ethereum>> for WitnessInformation {
deposit_address: hex_encode_bytes(value.deposit_address.as_bytes()),
amount: value.amount.into(),
asset: value.asset.into(),
deposit_details: DepositDetails::Ethereum {
tx_hashes: value.deposit_details.tx_hashes,
},
jerryafr marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
Expand All @@ -132,6 +145,10 @@ impl From<DepositInfo<Bitcoin>> for WitnessInformation {
deposit_address: value.deposit_address.to_humanreadable(network),
amount: value.amount.into(),
asset: value.asset.into(),
deposit_details: DepositDetails::Bitcoin {
tx_id: value.deposit_details.tx_id,
vout: value.deposit_details.vout,
kylezs marked this conversation as resolved.
Show resolved Hide resolved
},
}
}
}
Expand All @@ -143,6 +160,7 @@ impl From<DepositInfo<Polkadot>> for WitnessInformation {
deposit_address: hex_encode_bytes(value.deposit_address.aliased_ref()),
amount: value.amount.into(),
asset: value.asset.into(),
deposit_details: DepositDetails::Polkadot { extrinsic_index: value.deposit_details },
}
}
}
Expand All @@ -154,6 +172,9 @@ impl From<DepositInfo<Arbitrum>> for WitnessInformation {
deposit_address: hex_encode_bytes(value.deposit_address.as_bytes()),
amount: value.amount.into(),
asset: value.asset.into(),
deposit_details: DepositDetails::Arbitrum {
tx_hashes: value.deposit_details.tx_hashes,
},
}
}
}
Expand Down Expand Up @@ -208,15 +229,8 @@ where
deposit_witnesses,
block_height,
}) =>
for witness in deposit_witnesses as Vec<DepositWitness<Polkadot>> {
store
.save_to_array(&WitnessInformation::from((
witness,
block_height,
chainflip_network,
)))
.await?;
},
save_deposit_witnesses(store, deposit_witnesses, block_height, chainflip_network)
.await?,
ArbitrumIngressEgress(IngressEgressCall::process_deposits {
deposit_witnesses,
block_height,
Expand Down
Loading