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

[r2r] Group SwapOps method arguments #1529

Merged
merged 18 commits into from
Nov 9, 2022
Merged

[r2r] Group SwapOps method arguments #1529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c874723
changes in bch, eth, slp, tendermint_coin, tendermint_token, test_coi…
laruh Oct 31, 2022
3490489
Merge remote-tracking branch 'origin/dev' into group_SwapOps_method_a…
laruh Oct 31, 2022
2b084cb
changes in qrc20, qtum, solana, solana/spl
laruh Oct 31, 2022
07cb751
changes in lightning, z_coin, taker and maker swap
laruh Nov 1, 2022
35c0a04
qrc20_tests, utxo_tests, tendermint_coin_tests
laruh Nov 1, 2022
87620f0
eth_tests
laruh Nov 1, 2022
1089678
qrc20_tests was changed
laruh Nov 2, 2022
6fd2cf7
docker_tests, maker_swap, taker_swap
laruh Nov 2, 2022
e2f7a86
Merge remote-tracking branch 'origin/dev' into group_SwapOps_method_a…
laruh Nov 2, 2022
7632974
Merge remote-tracking branch 'origin/dev' into group_SwapOps_method_a…
laruh Nov 3, 2022
768dd01
fmt fix
laruh Nov 3, 2022
36af779
fix wasm test for eth
laruh Nov 3, 2022
1bec201
Merge remote-tracking branch 'origin/dev' into group_SwapOps_method_a…
laruh Nov 3, 2022
cb52486
fix merge conflicts
laruh Nov 3, 2022
8b9a9a0
add other_pubkey and other_payment_tx, create instances in tests
laruh Nov 4, 2022
639d0e0
use &* with dhash160
laruh Nov 4, 2022
578e2f7
Merge remote-tracking branch 'origin/dev' into group_SwapOps_method_a…
laruh Nov 4, 2022
2125cb0
resolve conflicts
laruh Nov 4, 2022
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
171 changes: 63 additions & 108 deletions mm2src/coins/eth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,20 @@ use web3::types::{Action as TraceAction, BlockId, BlockNumber, Bytes, CallReques
use web3::{self, Web3};
use web3_transport::{EthFeeHistoryNamespace, Web3Transport, Web3TransportNode};

use super::{coin_conf, AsyncMutex, BalanceError, BalanceFut, CoinBalance, CoinFutSpawner, CoinProtocol,
CoinTransportMetrics, CoinsContext, FeeApproxStage, FoundSwapTxSpend, HistorySyncState, MarketCoinOps,
MmCoin, MyAddressError, NegotiateSwapContractAddrErr, NumConversError, NumConversResult,
use super::{coin_conf, AsyncMutex, BalanceError, BalanceFut, CheckIfMyPaymentSentArgs, CoinBalance, CoinFutSpawner,
CoinProtocol, CoinTransportMetrics, CoinsContext, FeeApproxStage, FoundSwapTxSpend, HistorySyncState,
MarketCoinOps, MmCoin, MyAddressError, NegotiateSwapContractAddrErr, NumConversError, NumConversResult,
PaymentInstructions, PaymentInstructionsErr, RawTransactionError, RawTransactionFut,
RawTransactionRequest, RawTransactionRes, RawTransactionResult, RpcClientType, RpcTransportEventHandler,
RpcTransportEventHandlerShared, SearchForSwapTxSpendInput, SignatureError, SignatureResult, SwapOps,
RpcTransportEventHandlerShared, SearchForSwapTxSpendInput, SendMakerPaymentArgs,
SendMakerRefundsPaymentArgs, SendMakerSpendsTakerPaymentArgs, SendTakerPaymentArgs,
SendTakerRefundsPaymentArgs, SendTakerSpendsMakerPaymentArgs, SignatureError, SignatureResult, SwapOps,
TradeFee, TradePreimageError, TradePreimageFut, TradePreimageResult, TradePreimageValue, Transaction,
TransactionDetails, TransactionEnum, TransactionErr, TransactionFut, TxMarshalingErr,
UnexpectedDerivationMethod, ValidateAddressResult, ValidateInstructionsErr, ValidateOtherPubKeyErr,
ValidatePaymentError, ValidatePaymentFut, ValidatePaymentInput, VerificationError, VerificationResult,
WatcherOps, WatcherValidatePaymentInput, WithdrawError, WithdrawFee, WithdrawFut, WithdrawRequest,
WithdrawResult};

UnexpectedDerivationMethod, ValidateAddressResult, ValidateFeeArgs, ValidateInstructionsErr,
ValidateOtherPubKeyErr, ValidatePaymentError, ValidatePaymentFut, ValidatePaymentInput, VerificationError,
VerificationResult, WatcherOps, WatcherValidatePaymentInput, WithdrawError, WithdrawFee, WithdrawFut,
WithdrawRequest, WithdrawResult};
pub use rlp;

#[cfg(test)] mod eth_tests;
Expand Down Expand Up @@ -729,53 +730,33 @@ impl SwapOps for EthCoin {
)
}

fn send_maker_payment(
&self,
_time_lock_duration: u64,
time_lock: u32,
taker_pub: &[u8],
secret_hash: &[u8],
amount: BigDecimal,
swap_contract_address: &Option<BytesJson>,
_swap_unique_data: &[u8],
_payment_instructions: &Option<PaymentInstructions>,
) -> TransactionFut {
let taker_addr = try_tx_fus!(addr_from_raw_pubkey(taker_pub));
let swap_contract_address = try_tx_fus!(swap_contract_address.try_to_address());
fn send_maker_payment(&self, maker_payment: SendMakerPaymentArgs) -> TransactionFut {
let taker_addr = try_tx_fus!(addr_from_raw_pubkey(maker_payment.other_pubkey));
let swap_contract_address = try_tx_fus!(maker_payment.swap_contract_address.try_to_address());

Box::new(
self.send_hash_time_locked_payment(
self.etomic_swap_id(time_lock, secret_hash),
try_tx_fus!(wei_from_big_decimal(&amount, self.decimals)),
time_lock,
secret_hash,
self.etomic_swap_id(maker_payment.time_lock, maker_payment.secret_hash),
try_tx_fus!(wei_from_big_decimal(&maker_payment.amount, self.decimals)),
maker_payment.time_lock,
maker_payment.secret_hash,
taker_addr,
swap_contract_address,
)
.map(TransactionEnum::from),
)
}

fn send_taker_payment(
&self,
_time_lock_duration: u64,
time_lock: u32,
maker_pub: &[u8],
secret_hash: &[u8],
amount: BigDecimal,
swap_contract_address: &Option<BytesJson>,
_swap_unique_data: &[u8],
_payment_instructions: &Option<PaymentInstructions>,
) -> TransactionFut {
let maker_addr = try_tx_fus!(addr_from_raw_pubkey(maker_pub));
let swap_contract_address = try_tx_fus!(swap_contract_address.try_to_address());
fn send_taker_payment(&self, taker_payment: SendTakerPaymentArgs) -> TransactionFut {
let maker_addr = try_tx_fus!(addr_from_raw_pubkey(taker_payment.other_pubkey));
let swap_contract_address = try_tx_fus!(taker_payment.swap_contract_address.try_to_address());

Box::new(
self.send_hash_time_locked_payment(
self.etomic_swap_id(time_lock, secret_hash),
try_tx_fus!(wei_from_big_decimal(&amount, self.decimals)),
time_lock,
secret_hash,
self.etomic_swap_id(taker_payment.time_lock, taker_payment.secret_hash),
try_tx_fus!(wei_from_big_decimal(&taker_payment.amount, self.decimals)),
taker_payment.time_lock,
taker_payment.secret_hash,
maker_addr,
swap_contract_address,
)
Expand All @@ -785,98 +766,77 @@ impl SwapOps for EthCoin {

fn send_maker_spends_taker_payment(
&self,
taker_payment_tx: &[u8],
_time_lock: u32,
_taker_pub: &[u8],
secret: &[u8],
secret_hash: &[u8],
swap_contract_address: &Option<BytesJson>,
_swap_unique_data: &[u8],
maker_spends_payment_args: SendMakerSpendsTakerPaymentArgs,
) -> TransactionFut {
let tx: UnverifiedTransaction = try_tx_fus!(rlp::decode(taker_payment_tx));
let tx: UnverifiedTransaction = try_tx_fus!(rlp::decode(maker_spends_payment_args.other_payment_tx));
let signed = try_tx_fus!(SignedEthTx::new(tx));
let swap_contract_address = try_tx_fus!(swap_contract_address.try_to_address(), signed);
let swap_contract_address =
try_tx_fus!(maker_spends_payment_args.swap_contract_address.try_to_address(), signed);

Box::new(
self.spend_hash_time_locked_payment(signed, secret_hash, swap_contract_address, secret)
.map(TransactionEnum::from),
self.spend_hash_time_locked_payment(
signed,
maker_spends_payment_args.secret_hash,
swap_contract_address,
maker_spends_payment_args.secret,
)
.map(TransactionEnum::from),
)
}

fn send_taker_spends_maker_payment(
&self,
maker_payment_tx: &[u8],
_time_lock: u32,
_maker_pub: &[u8],
secret: &[u8],
secret_hash: &[u8],
swap_contract_address: &Option<BytesJson>,
_swap_unique_data: &[u8],
taker_spends_payment_args: SendTakerSpendsMakerPaymentArgs,
) -> TransactionFut {
let tx: UnverifiedTransaction = try_tx_fus!(rlp::decode(maker_payment_tx));
let tx: UnverifiedTransaction = try_tx_fus!(rlp::decode(taker_spends_payment_args.other_payment_tx));
let signed = try_tx_fus!(SignedEthTx::new(tx));
let swap_contract_address = try_tx_fus!(swap_contract_address.try_to_address());
let swap_contract_address = try_tx_fus!(taker_spends_payment_args.swap_contract_address.try_to_address());
Box::new(
self.spend_hash_time_locked_payment(signed, secret_hash, swap_contract_address, secret)
.map(TransactionEnum::from),
self.spend_hash_time_locked_payment(
signed,
taker_spends_payment_args.secret_hash,
swap_contract_address,
taker_spends_payment_args.secret,
)
.map(TransactionEnum::from),
)
}

fn send_taker_refunds_payment(
&self,
taker_payment_tx: &[u8],
_time_lock: u32,
_maker_pub: &[u8],
secret_hash: &[u8],
swap_contract_address: &Option<BytesJson>,
_swap_unique_data: &[u8],
) -> TransactionFut {
let tx: UnverifiedTransaction = try_tx_fus!(rlp::decode(taker_payment_tx));
fn send_taker_refunds_payment(&self, taker_refunds_payment_args: SendTakerRefundsPaymentArgs) -> TransactionFut {
let tx: UnverifiedTransaction = try_tx_fus!(rlp::decode(taker_refunds_payment_args.payment_tx));
let signed = try_tx_fus!(SignedEthTx::new(tx));
let swap_contract_address = try_tx_fus!(swap_contract_address.try_to_address());
let swap_contract_address = try_tx_fus!(taker_refunds_payment_args.swap_contract_address.try_to_address());

Box::new(
self.refund_hash_time_locked_payment(swap_contract_address, signed, secret_hash)
self.refund_hash_time_locked_payment(swap_contract_address, signed, taker_refunds_payment_args.secret_hash)
.map(TransactionEnum::from),
)
}

fn send_maker_refunds_payment(
&self,
maker_payment_tx: &[u8],
_time_lock: u32,
_taker_pub: &[u8],
secret_hash: &[u8],
swap_contract_address: &Option<BytesJson>,
_swap_unique_data: &[u8],
) -> TransactionFut {
let tx: UnverifiedTransaction = try_tx_fus!(rlp::decode(maker_payment_tx));
fn send_maker_refunds_payment(&self, maker_refunds_payment_args: SendMakerRefundsPaymentArgs) -> TransactionFut {
let tx: UnverifiedTransaction = try_tx_fus!(rlp::decode(maker_refunds_payment_args.payment_tx));
let signed = try_tx_fus!(SignedEthTx::new(tx));
let swap_contract_address = try_tx_fus!(swap_contract_address.try_to_address());
let swap_contract_address = try_tx_fus!(maker_refunds_payment_args.swap_contract_address.try_to_address());

Box::new(
self.refund_hash_time_locked_payment(swap_contract_address, signed, secret_hash)
self.refund_hash_time_locked_payment(swap_contract_address, signed, maker_refunds_payment_args.secret_hash)
.map(TransactionEnum::from),
)
}

fn validate_fee(
&self,
fee_tx: &TransactionEnum,
expected_sender: &[u8],
fee_addr: &[u8],
amount: &BigDecimal,
min_block_number: u64,
_uuid: &[u8],
validate_fee_args: ValidateFeeArgs<'_>,
) -> Box<dyn Future<Item = (), Error = String> + Send> {
let selfi = self.clone();
let tx = match fee_tx {
let tx = match validate_fee_args.fee_tx {
TransactionEnum::SignedEthTx(t) => t.clone(),
_ => panic!(),
};
let sender_addr = try_fus!(addr_from_raw_pubkey(expected_sender));
let fee_addr = try_fus!(addr_from_raw_pubkey(fee_addr));
let amount = amount.clone();
let sender_addr = try_fus!(addr_from_raw_pubkey(validate_fee_args.expected_sender));
let fee_addr = try_fus!(addr_from_raw_pubkey(validate_fee_args.fee_addr));
let amount = validate_fee_args.amount.clone();
sergeyboyko0791 marked this conversation as resolved.
Show resolved Hide resolved
let min_block_number = validate_fee_args.min_block_number;

let fut = async move {
let expected_value = try_s!(wei_from_big_decimal(&amount, selfi.decimals));
Expand Down Expand Up @@ -999,17 +959,12 @@ impl SwapOps for EthCoin {

fn check_if_my_payment_sent(
&self,
time_lock: u32,
_other_pub: &[u8],
secret_hash: &[u8],
from_block: u64,
swap_contract_address: &Option<BytesJson>,
_swap_unique_data: &[u8],
_amount: &BigDecimal,
if_my_payment_spent_args: CheckIfMyPaymentSentArgs,
) -> Box<dyn Future<Item = Option<TransactionEnum>, Error = String> + Send> {
let id = self.etomic_swap_id(time_lock, secret_hash);
let swap_contract_address = try_fus!(swap_contract_address.try_to_address());
let id = self.etomic_swap_id(if_my_payment_spent_args.time_lock, if_my_payment_spent_args.secret_hash);
let swap_contract_address = try_fus!(if_my_payment_spent_args.swap_contract_address.try_to_address());
let selfi = self.clone();
let from_block = if_my_payment_spent_args.search_from_block;
let fut = async move {
let status = try_s!(
selfi
Expand Down
Loading