feature/PRO-1712/reject-tx

api/bin/chainflip-ingress-egress-tracker/src/witnessing/state_chain.rs

@@ -147,8 +147,8 @@ impl From<DepositInfo<Bitcoin>> for WitnessInformation {
 			amount: value.amount.into(),
 			asset: value.asset.into(),
 			deposit_details: Some(DepositDetails::Bitcoin {
-				tx_id: value.deposit_details.utxo_id.tx_id,
-				vout: value.deposit_details.utxo_id.vout,
+				tx_id: value.deposit_details.id.tx_id,
+				vout: value.deposit_details.id.vout,
 			}),
 		}
 	}

engine/src/witness/btc/deposits.rs

@@ -19,7 +19,7 @@ use crate::{
 use bitcoin::{hashes::Hash, BlockHash};
 use cf_chains::{
 	assets::btc,
-	btc::{deposit_address::DepositAddress, BtcDepositDetails, UtxoId},
+	btc::{deposit_address::DepositAddress, Utxo, UtxoId},
 	Bitcoin,
 };
 
@@ -115,12 +115,14 @@ fn deposit_witnesses(
 				.filter(|(_vout, tx_out)| tx_out.value.to_sat() > 0)
 				.filter_map(|(vout, tx_out)| {
 					deposit_addresses.get(tx_out.script_pubkey.as_bytes()).map(|deposit_address| {
+						let amount = tx_out.value.to_sat();
 						DepositWitness::<Bitcoin> {
 							deposit_address: deposit_address.script_pubkey(),
 							asset: btc::Asset::Btc,
-							amount: tx_out.value.to_sat(),
-							deposit_details: BtcDepositDetails {
-								utxo_id: UtxoId { tx_id: tx.txid.to_byte_array().into(), vout },
+							amount,
+							deposit_details: Utxo {
+								id: UtxoId { tx_id: tx.txid.to_byte_array().into(), vout },
+								amount,
 								deposit_address: deposit_address.clone(),
 							},
 						}

engine/src/witness/btc/smart_contract.rs

@@ -3,8 +3,8 @@ use cf_amm::common::{bounded_sqrt_price, sqrt_price_to_price};
 use cf_chains::{
 	assets::btc::Asset as BtcAsset,
 	btc::{
-		deposit_address::DepositAddress, smart_contract_encoding::UtxoEncodedData,
-		BtcDepositDetails, ScriptPubkey, UtxoId,
+		deposit_address::DepositAddress, smart_contract_encoding::UtxoEncodedData, ScriptPubkey,
+		Utxo, UtxoId,
 	},
 	ChannelRefundParameters, ForeignChainAddress,
 };
@@ -134,9 +134,10 @@ pub fn try_extract_contract_call(
 		deposit_amount,
 		destination_address: data.output_address,
 		tx_hash: tx_id,
-		deposit_details: Box::new(BtcDepositDetails {
+		deposit_details: Box::new(Utxo {
 			// we require the deposit to be the first UTXO
-			utxo_id: UtxoId { tx_id: tx_id.into(), vout: 0 },
+			id: UtxoId { tx_id: tx_id.into(), vout: 0 },
+			amount: deposit_amount,
 			deposit_address: vault_address.clone(),
 		}),
 		deposit_metadata: None, // No ccm for BTC (yet?)
@@ -274,8 +275,9 @@ mod tests {
 				deposit_amount: DEPOSIT_AMOUNT,
 				destination_address: MOCK_SWAP_PARAMS.output_address.clone(),
 				tx_hash: tx.hash.to_byte_array(),
-				deposit_details: Box::new(BtcDepositDetails {
-					utxo_id: UtxoId { tx_id: tx.txid.to_byte_array().into(), vout: 0 },
+				deposit_details: Box::new(Utxo {
+					id: UtxoId { tx_id: tx.txid.to_byte_array().into(), vout: 0 },
+					amount: DEPOSIT_AMOUNT,
 					deposit_address: vault_deposit_address,
 				}),
 				broker_fees: Default::default(),

state-chain/cf-integration-tests/src/broadcasting.rs

@@ -1,6 +1,6 @@
 use super::*;
 use cf_chains::{
-	btc::{deposit_address::DepositAddress, ScriptPubkey},
+	btc::{deposit_address::DepositAddress, ScriptPubkey, Utxo},
 	AllBatch, Bitcoin, ForeignChain, TransferAssetParams,
 };
 use cf_primitives::{chains::assets::btc, AuthorityCount, BroadcastId};
@@ -26,11 +26,11 @@ fn bitcoin_broadcast_delay_works() {
 			let epoch = Validator::epoch_index();
 			let bitcoin_agg_key = BitcoinThresholdSigner::keys(epoch).unwrap().current;
 			let egress_id = (ForeignChain::Bitcoin, 1u64);
-			Environment::add_bitcoin_utxo_to_list(
-				1_000_000_000_000u64,
-				Default::default(),
-				DepositAddress::new(bitcoin_agg_key, 0u32),
-			);
+			Environment::add_bitcoin_utxo_to_list(Utxo {
+				id: Default::default(),
+				amount: 1_000_000_000_000u64,
+				deposit_address: DepositAddress::new(bitcoin_agg_key, 0u32),
+			});
 
 			// Cause bitcoin vault to rotate - but stop the broadcasting.
 			let (bitcoin_call, _egress_ids) = AllBatch::<Bitcoin>::new_unsigned(

state-chain/cf-integration-tests/src/new_epoch.rs

@@ -238,7 +238,7 @@ fn utxo(amount: BtcAmount, salt: u32, pub_key: Option<[u8; 32]>) -> Utxo {
 }
 
 fn add_utxo_amount(utxo: Utxo) {
-	Environment::add_bitcoin_utxo_to_list(utxo.amount, utxo.id, utxo.deposit_address);
+	Environment::add_bitcoin_utxo_to_list(utxo);
 }
 
 #[test]

state-chain/chains/src/any.rs

@@ -1,7 +1,7 @@
 use crate::{
 	address::{ForeignChainAddress, IntoForeignChainAddress},
 	none::NoneChainCrypto,
-	Chain, FeeRefundCalculator,
+	Chain, DepositDetailsToTransactionInId, FeeRefundCalculator,
 };
 use codec::{FullCodec, MaxEncodedLen};
 use frame_support::Parameter;
@@ -52,3 +52,5 @@ impl IntoForeignChainAddress<AnyChain> for ForeignChainAddress {
 		address
 	}
 }
+
+impl DepositDetailsToTransactionInId<NoneChainCrypto> for () {}

state-chain/chains/src/arb/api.rs

@@ -150,6 +150,11 @@ impl<E> From<EvmTransactionBuilder<transfer_fallback::TransferFallback>> for Arb
 	}
 }
 
+impl<E> RejectCall<Arbitrum> for ArbitrumApi<E> where
+	E: EvmEnvironmentProvider<Arbitrum> + ReplayProtectionProvider<Arbitrum>
+{
+}
+
 macro_rules! map_over_api_variants {
 	( $self:expr, $var:pat_param, $var_method:expr $(,)* ) => {
 		match $self {

state-chain/chains/src/benchmarking_value.rs

@@ -15,7 +15,7 @@ use sp_std::vec;
 #[cfg(feature = "runtime-benchmarks")]
 use crate::{
 	address::{EncodedAddress, ForeignChainAddress},
-	btc::{BtcDepositDetails, UtxoId},
+	btc::{Utxo, UtxoId},
 	dot::PolkadotTransactionId,
 	evm::{DepositDetails, EvmFetchId, EvmTransactionMetadata},
 };
@@ -225,10 +225,11 @@ impl BenchmarkValue for DepositDetails {
 }
 
 #[cfg(feature = "runtime-benchmarks")]
-impl BenchmarkValue for BtcDepositDetails {
+impl BenchmarkValue for Utxo {
 	fn benchmark_value() -> Self {
-		BtcDepositDetails {
-			utxo_id: UtxoId::benchmark_value(),
+		Utxo {
+			id: UtxoId::benchmark_value(),
+			amount: 10_000_000,
 			deposit_address: crate::btc::deposit_address::DepositAddress::new([0; 32], 0),
 		}
 	}

state-chain/chains/src/btc.rs

@@ -7,8 +7,8 @@ pub mod utxo_selection;
 extern crate alloc;
 use self::deposit_address::DepositAddress;
 use crate::{
-	benchmarking_value::BenchmarkValue, Chain, ChainCrypto, DepositChannel, FeeEstimationApi,
-	FeeRefundCalculator, RetryPolicy,
+	benchmarking_value::BenchmarkValue, Chain, ChainCrypto, DepositChannel,
+	DepositDetailsToTransactionInId, FeeEstimationApi, FeeRefundCalculator, RetryPolicy,
 };
 use alloc::{collections::VecDeque, string::String};
 use arrayref::array_ref;
@@ -227,12 +227,6 @@ impl BitcoinFeeInfo {
 	}
 }
 
-#[derive(Encode, Decode, TypeInfo, Clone, RuntimeDebug, PartialEq, Eq, MaxEncodedLen)]
-pub struct BtcDepositDetails {
-	pub utxo_id: UtxoId,
-	pub deposit_address: DepositAddress,
-}
-
 impl Chain for Bitcoin {
 	const NAME: &'static str = "Bitcoin";
 	const GAS_ASSET: Self::ChainAsset = assets::btc::Asset::Btc;
@@ -250,7 +244,7 @@ impl Chain for Bitcoin {
 	type ChainAccount = ScriptPubkey;
 	type DepositFetchId = BitcoinFetchId;
 	type DepositChannelState = DepositAddress;
-	type DepositDetails = BtcDepositDetails;
+	type DepositDetails = Utxo;
 	type Transaction = BitcoinTransactionData;
 	type TransactionMetadata = ();
 	type TransactionRef = Hash;
@@ -406,6 +400,12 @@ impl Utxo {
 	}
 }
 
+impl DepositDetailsToTransactionInId<BitcoinCrypto> for Utxo {
+	fn deposit_id(&self) -> Option<Hash> {
+		Some(self.id.tx_id)
+	}
+}
+
 #[derive(Encode, Decode, TypeInfo, MaxEncodedLen, Clone, RuntimeDebug, PartialEq, Eq)]
 pub struct BitcoinOutput {
 	pub amount: u64,

state-chain/chains/src/btc/api.rs

@@ -4,7 +4,7 @@ use super::{
 	deposit_address::DepositAddress, AggKey, Bitcoin, BitcoinCrypto, BitcoinOutput, BtcAmount,
 	Utxo, BITCOIN_DUST_LIMIT, CHANGE_ADDRESS_SALT,
 };
-use crate::*;
+use crate::{btc::BitcoinTransaction, *};
 use frame_support::{CloneNoBound, DebugNoBound, EqNoBound, Never, PartialEqNoBound};
 use sp_std::marker::PhantomData;
 
@@ -13,6 +13,7 @@ use sp_std::marker::PhantomData;
 #[allow(clippy::large_enum_variant)]
 pub enum BitcoinApi<Environment: 'static> {
 	BatchTransfer(batch_transfer::BatchTransfer),
+	NoChangeTransfer(BitcoinTransaction),
 	#[doc(hidden)]
 	#[codec(skip)]
 	_Phantom(PhantomData<Environment>, Never),
@@ -146,6 +147,25 @@ impl<E: ReplayProtectionProvider<Bitcoin>> ExecutexSwapAndCall<Bitcoin> for Bitc
 	}
 }
 
+impl<E: ReplayProtectionProvider<Bitcoin>> RejectCall<Bitcoin> for BitcoinApi<E>
+where
+	E: ChainEnvironment<UtxoSelectionType, SelectedUtxosAndChangeAmount>
+		+ ChainEnvironment<(), AggKey>,
+{
+	fn new_unsigned(
+		deposit_details: <Bitcoin as Chain>::DepositDetails,
+		refund_address: <Bitcoin as Chain>::ChainAccount,
+		refund_amount: <Bitcoin as Chain>::ChainAmount,
+	) -> Result<Self, RejectError> {
+		let agg_key = <E as ChainEnvironment<(), AggKey>>::lookup(()).ok_or(RejectError::Other)?;
+		Ok(Self::NoChangeTransfer(BitcoinTransaction::create_new_unsigned(
+			&agg_key,
+			vec![deposit_details],
+			vec![BitcoinOutput { amount: refund_amount, script_pubkey: refund_address }],
+		)))
+	}
+}
+
 // transfer_fallback is unsupported for Bitcoin.
 impl<E: ReplayProtectionProvider<Bitcoin>> TransferFallback<Bitcoin> for BitcoinApi<E> {
 	fn new_unsigned(
@@ -159,7 +179,7 @@ impl<E> ApiCall<BitcoinCrypto> for BitcoinApi<E> {
 	fn threshold_signature_payload(&self) -> <BitcoinCrypto as ChainCrypto>::Payload {
 		match self {
 			BitcoinApi::BatchTransfer(tx) => tx.threshold_signature_payload(),
-
+			BitcoinApi::NoChangeTransfer(tx) => tx.get_signing_payloads(),
 			BitcoinApi::_Phantom(..) => unreachable!(),
 		}
 	}
@@ -171,29 +191,34 @@ impl<E> ApiCall<BitcoinCrypto> for BitcoinApi<E> {
 	) -> Self {
 		match self {
 			BitcoinApi::BatchTransfer(call) => call.signed(threshold_signature, signer).into(),
+			BitcoinApi::NoChangeTransfer(mut tx) => {
+				tx.add_signer_and_signatures(signer, threshold_signature.clone());
+				Self::NoChangeTransfer(tx)
+			},
 			BitcoinApi::_Phantom(..) => unreachable!(),
 		}
 	}
 
 	fn chain_encoded(&self) -> Vec<u8> {
 		match self {
 			BitcoinApi::BatchTransfer(call) => call.chain_encoded(),
-
+			BitcoinApi::NoChangeTransfer(call) => call.clone().finalize(),
 			BitcoinApi::_Phantom(..) => unreachable!(),
 		}
 	}
 
 	fn is_signed(&self) -> bool {
 		match self {
 			BitcoinApi::BatchTransfer(call) => call.is_signed(),
-
+			BitcoinApi::NoChangeTransfer(call) => call.is_signed(),
 			BitcoinApi::_Phantom(..) => unreachable!(),
 		}
 	}
 
 	fn transaction_out_id(&self) -> <BitcoinCrypto as ChainCrypto>::TransactionOutId {
 		match self {
 			BitcoinApi::BatchTransfer(call) => call.transaction_out_id(),
+			BitcoinApi::NoChangeTransfer(call) => call.txid(),
 			BitcoinApi::_Phantom(..) => unreachable!(),
 		}
 	}
@@ -205,6 +230,8 @@ impl<E> ApiCall<BitcoinCrypto> for BitcoinApi<E> {
 	fn signer(&self) -> Option<<BitcoinCrypto as ChainCrypto>::AggKey> {
 		match self {
 			BitcoinApi::BatchTransfer(call) => call.signer(),
+			BitcoinApi::NoChangeTransfer(call) =>
+				call.signer_and_signatures.as_ref().map(|(signer, _)| (*signer)),
 			BitcoinApi::_Phantom(..) => unreachable!(),
 		}
 	}

state-chain/chains/src/dot.rs

@@ -520,6 +520,8 @@ pub enum PolkadotRuntimeCall {
 #[derive(Debug, Encode, Decode, Clone, Eq, PartialEq, TypeInfo)]
 pub enum SystemCall {}
 
+impl DepositDetailsToTransactionInId<PolkadotCrypto> for u32 {}
+
 #[allow(non_camel_case_types)]
 #[derive(Debug, Encode, Decode, Clone, Eq, PartialEq, TypeInfo)]
 pub enum BalancesCall {

state-chain/chains/src/dot/api.rs

@@ -145,6 +145,11 @@ where
 	}
 }
 
+impl<E> RejectCall<Polkadot> for PolkadotApi<E> where
+	E: PolkadotEnvironment + ReplayProtectionProvider<Polkadot>
+{
+}
+
 #[macro_export]
 macro_rules! map_over_api_variants {
 	( $self:expr, $var:pat_param, $var_method:expr $(,)* ) => {

state-chain/chains/src/eth/api.rs

@@ -237,6 +237,11 @@ where
 	}
 }
 
+impl<E> RejectCall<Ethereum> for EthereumApi<E> where
+	E: EvmEnvironmentProvider<Ethereum> + ReplayProtectionProvider<Ethereum>
+{
+}
+
 impl<E> From<EvmTransactionBuilder<set_agg_key_with_agg_key::SetAggKeyWithAggKey>>
 	for EthereumApi<E>
 {

state-chain/chains/src/evm.rs

@@ -21,6 +21,8 @@ use serde::{Deserialize, Serialize};
 use sp_core::ConstBool;
 use sp_std::{convert::TryFrom, str, vec};
 
+use crate::DepositDetailsToTransactionInId;
+
 #[derive(Clone, Debug, PartialEq, Eq, Encode, Decode, TypeInfo, Default)]
 pub struct DepositDetails {
 	// In the case of EVM Native Deposits (ETH or arbETH), because we need to detect ingresses by
@@ -650,6 +652,12 @@ pub struct TransactionFee {
 	pub gas_used: u128,
 }
 
+impl DepositDetailsToTransactionInId<EvmCrypto> for DepositDetails {
+	fn deposit_id(&self) -> Option<H256> {
+		None
+	}
+}
+
 #[cfg(test)]
 pub(crate) mod tests {
 	use super::*;