Skip to content

fix(TPU): correct dexfee in check balance to prevent swap failures #2600

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

Merged
shamardy merged 15 commits into from
Oct 7, 2025
Merged

fix(TPU): correct dexfee in check balance to prevent swap failures #2600

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
83e1f39
fix platform ticker in TakerSwapPreparedParams for taker swap v2
Jul 26, 2025
9534906
update TPU contracts ABI and bytecode
Jul 30, 2025
76e5b84
improve eth TPU kickstart test to check balances
Jul 30, 2025
d237d49
fix(TPU): remove extra dexfee from volume
Aug 19, 2025
d4a7e49
Merge branch 'dev' into fix-TPU-platform-ticker
Aug 19, 2025
9804682
fix cargo fmt
Aug 19, 2025
5ca54b5
revert erc711 and erc1155 byte code (to use ver with mint fn)
Aug 19, 2025
b290ab8
revert IERC1155 and IERC721 ABI .json
Aug 21, 2025
17de3cf
improve comment
Sep 2, 2025
b279564
fix(review): add dexfee to preimage volume
Sep 12, 2025
5612c6e
fix(tests): add timeout to make test_approve_erc20 stable
Sep 12, 2025
f8a1194
Merge remote-tracking branch 'origin/dev' into fix-TPU-dexfee
shamardy Oct 6, 2025
8977726
fix(test): update eth test tolerance (following decreased gas fee due…
Oct 6, 2025
676e67e
fix(test): add more gas fee tolerance in balance check
Oct 7, 2025
95acde1
refactor(test): improve check tolerance and add more doc comments
Oct 7, 2025
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: 4 additions & 0 deletions mm2src/coins/eth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,13 @@ pub const ERC20_ABI: &str = include_str!("eth/erc20_abi.json");
const ERC721_ABI: &str = include_str!("eth/erc721_abi.json");
/// https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1155.md
const ERC1155_ABI: &str = include_str!("eth/erc1155_abi.json");
/// https://github.com/KomodoPlatform/etomic-swap/blob/7d4eafd4a408188a95aee78a41f0bf5f9116ffa2/contracts/EtomicSwapNft.sol
const NFT_SWAP_CONTRACT_ABI: &str = include_str!("eth/nft_swap_contract_abi.json");
/// https://github.com/KomodoPlatform/etomic-swap/blob/7d4eafd4a408188a95aee78a41f0bf5f9116ffa2/contracts/EtomicSwapMakerNftV2.sol
const NFT_MAKER_SWAP_V2_ABI: &str = include_str!("eth/nft_maker_swap_v2_abi.json");
/// https://github.com/KomodoPlatform/etomic-swap/blob/7d4eafd4a408188a95aee78a41f0bf5f9116ffa2/contracts/EtomicSwapMakerV2.sol
const MAKER_SWAP_V2_ABI: &str = include_str!("eth/maker_swap_v2_abi.json");
/// https://github.com/KomodoPlatform/etomic-swap/blob/7d4eafd4a408188a95aee78a41f0bf5f9116ffa2/contracts/EtomicSwapTakerV2.sol
const TAKER_SWAP_V2_ABI: &str = include_str!("eth/taker_swap_v2_abi.json");

/// Payment states from etomic swap smart contract: https://github.com/artemii235/etomic-swap/blob/master/contracts/EtomicSwap.sol#L5
Expand Down
285 changes: 284 additions & 1 deletion mm2src/coins/eth/maker_swap_v2_abi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,284 @@
[{"inputs":[{"internalType":"address","name":"target","type":"address"}],"name":"AddressEmptyCode","type":"error"},{"inputs":[{"internalType":"address","name":"account","type":"address"}],"name":"AddressInsufficientBalance","type":"error"},{"inputs":[],"name":"FailedInnerCall","type":"error"},{"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"SafeERC20FailedOperation","type":"error"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"bytes32","name":"id","type":"bytes32"}],"name":"MakerPaymentRefundedSecret","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"bytes32","name":"id","type":"bytes32"}],"name":"MakerPaymentRefundedTimelock","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"bytes32","name":"id","type":"bytes32"}],"name":"MakerPaymentSent","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"bytes32","name":"id","type":"bytes32"}],"name":"MakerPaymentSpent","type":"event"},{"inputs":[{"internalType":"bytes32","name":"id","type":"bytes32"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"tokenAddress","type":"address"},{"internalType":"address","name":"taker","type":"address"},{"internalType":"bytes32","name":"takerSecretHash","type":"bytes32"},{"internalType":"bytes32","name":"makerSecretHash","type":"bytes32"},{"internalType":"uint32","name":"paymentLockTime","type":"uint32"}],"name":"erc20MakerPayment","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"id","type":"bytes32"},{"internalType":"address","name":"taker","type":"address"},{"internalType":"bytes32","name":"takerSecretHash","type":"bytes32"},{"internalType":"bytes32","name":"makerSecretHash","type":"bytes32"},{"internalType":"uint32","name":"paymentLockTime","type":"uint32"}],"name":"ethMakerPayment","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"name":"makerPayments","outputs":[{"internalType":"bytes20","name":"paymentHash","type":"bytes20"},{"internalType":"uint32","name":"paymentLockTime","type":"uint32"},{"internalType":"enum EtomicSwapMakerV2.MakerPaymentState","name":"state","type":"uint8"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"id","type":"bytes32"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"taker","type":"address"},{"internalType":"bytes32","name":"takerSecret","type":"bytes32"},{"internalType":"bytes32","name":"makerSecretHash","type":"bytes32"},{"internalType":"address","name":"tokenAddress","type":"address"}],"name":"refundMakerPaymentSecret","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"id","type":"bytes32"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"taker","type":"address"},{"internalType":"bytes32","name":"takerSecretHash","type":"bytes32"},{"internalType":"bytes32","name":"makerSecretHash","type":"bytes32"},{"internalType":"address","name":"tokenAddress","type":"address"}],"name":"refundMakerPaymentTimelock","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"id","type":"bytes32"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"maker","type":"address"},{"internalType":"bytes32","name":"takerSecretHash","type":"bytes32"},{"internalType":"bytes32","name":"makerSecret","type":"bytes32"},{"internalType":"address","name":"tokenAddress","type":"address"}],"name":"spendMakerPayment","outputs":[],"stateMutability":"nonpayable","type":"function"}]
[
{
"inputs": [
{
"internalType": "address",
"name": "token",
"type": "address"
}
],
"name": "SafeERC20FailedOperation",
"type": "error"
},
{
"anonymous": false,
"inputs": [
{
"indexed": false,
"internalType": "bytes32",
"name": "id",
"type": "bytes32"
}
],
"name": "MakerPaymentRefundedSecret",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": false,
"internalType": "bytes32",
"name": "id",
"type": "bytes32"
}
],
"name": "MakerPaymentRefundedTimelock",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": false,
"internalType": "bytes32",
"name": "id",
"type": "bytes32"
}
],
"name": "MakerPaymentSent",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": false,
"internalType": "bytes32",
"name": "id",
"type": "bytes32"
}
],
"name": "MakerPaymentSpent",
"type": "event"
},
{
"inputs": [
{
"internalType": "bytes32",
"name": "id",
"type": "bytes32"
},
{
"internalType": "uint256",
"name": "amount",
"type": "uint256"
},
{
"internalType": "address",
"name": "tokenAddress",
"type": "address"
},
{
"internalType": "address",
"name": "taker",
"type": "address"
},
{
"internalType": "bytes32",
"name": "takerSecretHash",
"type": "bytes32"
},
{
"internalType": "bytes32",
"name": "makerSecretHash",
"type": "bytes32"
},
{
"internalType": "uint32",
"name": "paymentLockTime",
"type": "uint32"
}
],
"name": "erc20MakerPayment",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "bytes32",
"name": "id",
"type": "bytes32"
},
{
"internalType": "address",
"name": "taker",
"type": "address"
},
{
"internalType": "bytes32",
"name": "takerSecretHash",
"type": "bytes32"
},
{
"internalType": "bytes32",
"name": "makerSecretHash",
"type": "bytes32"
},
{
"internalType": "uint32",
"name": "paymentLockTime",
"type": "uint32"
}
],
"name": "ethMakerPayment",
"outputs": [],
"stateMutability": "payable",
"type": "function"
},
{
"inputs": [
{
"internalType": "bytes32",
"name": "",
"type": "bytes32"
}
],
"name": "makerPayments",
"outputs": [
{
"internalType": "bytes20",
"name": "paymentHash",
"type": "bytes20"
},
{
"internalType": "uint32",
"name": "paymentLockTime",
"type": "uint32"
},
{
"internalType": "enum EtomicSwapMakerV2.MakerPaymentState",
"name": "state",
"type": "uint8"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "bytes32",
"name": "id",
"type": "bytes32"
},
{
"internalType": "uint256",
"name": "amount",
"type": "uint256"
},
{
"internalType": "address",
"name": "taker",
"type": "address"
},
{
"internalType": "bytes32",
"name": "takerSecret",
"type": "bytes32"
},
{
"internalType": "bytes32",
"name": "makerSecretHash",
"type": "bytes32"
},
{
"internalType": "address",
"name": "tokenAddress",
"type": "address"
}
],
"name": "refundMakerPaymentSecret",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "bytes32",
"name": "id",
"type": "bytes32"
},
{
"internalType": "uint256",
"name": "amount",
"type": "uint256"
},
{
"internalType": "address",
"name": "taker",
"type": "address"
},
{
"internalType": "bytes32",
"name": "takerSecretHash",
"type": "bytes32"
},
{
"internalType": "bytes32",
"name": "makerSecretHash",
"type": "bytes32"
},
{
"internalType": "address",
"name": "tokenAddress",
"type": "address"
}
],
"name": "refundMakerPaymentTimelock",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "bytes32",
"name": "id",
"type": "bytes32"
},
{
"internalType": "uint256",
"name": "amount",
"type": "uint256"
},
{
"internalType": "address",
"name": "maker",
"type": "address"
},
{
"internalType": "bytes32",
"name": "takerSecretHash",
"type": "bytes32"
},
{
"internalType": "bytes32",
"name": "makerSecret",
"type": "bytes32"
},
{
"internalType": "address",
"name": "tokenAddress",
"type": "address"
}
],
"name": "spendMakerPayment",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
}
]
Loading
Loading