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

Move ETH tests to the new testnet #1828

Merged
merged 11 commits into from
May 22, 2023
Merged

Move ETH tests to the new testnet #1828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f24b088
move eth tests to the new testnet
caglaryucekaya May 17, 2023
99f1f7c
Merge branch 'dev' of github.com:KomodoPlatform/atomicDEX-API into et…
caglaryucekaya May 17, 2023
5dd02b8
Merge branch 'dev' of github.com:KomodoPlatform/atomicDEX-API into et…
caglaryucekaya May 17, 2023
dba8969
Merge branch 'dev' of github.com:KomodoPlatform/atomicDEX-API into et…
caglaryucekaya May 18, 2023
b1f4133
redo unnecessary changes
caglaryucekaya May 18, 2023
bd0f5ea
minor fixes
caglaryucekaya May 18, 2023
9d9d4d9
replace old contract address usages
caglaryucekaya May 20, 2023
a30615e
replace old contract address usages
caglaryucekaya May 20, 2023
a843862
use different addresses for failing tests
caglaryucekaya May 20, 2023
e86e548
add changelog
caglaryucekaya May 22, 2023
f4e3dcd
add sepolia url to test_nonce_several_urls test
caglaryucekaya May 22, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
- Detect a chain reorganization, if it occurs, redownload and revalidate the new best chain headers for SPV [#1728](https://github.com/KomodoPlatform/atomicDEX-API/pull/1728)
- Fix moralis request in wasm target, add moralis tests [#1817](https://github.com/KomodoPlatform/atomicDEX-API/pull/1817)
- PoSV support for UTXO coins was added in [#1815](https://github.com/KomodoPlatform/atomicDEX-API/pull/1815)
- Use a new testnet for ETH tests, reduce the amount of ETH and ERC20 tokens exchanged, use fixed addresses instead of one-time use random addresses, fix some existing bugs (https://github.com/KomodoPlatform/atomicDEX-API/pull/1828)


## v1.0.3-beta - 2023-04-28
Expand Down
10 changes: 5 additions & 5 deletions mm2src/coins/eth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ mod nonce;
use nonce::ParityNonce;

/// https://github.com/artemii235/etomic-swap/blob/master/contracts/EtomicSwap.sol
/// Dev chain (195.201.0.6:8565) contract address: 0xa09ad3cd7e96586ebd05a2607ee56b56fb2db8fd
/// Dev chain (195.201.137.5:8565) contract address: 0x83965C539899cC0F918552e5A26915de40ee8852
/// Ropsten: https://ropsten.etherscan.io/address/0x7bc1bbdd6a0a722fc9bffc49c921b685ecb84b94
/// ETH mainnet: https://etherscan.io/address/0x8500AFc0bc5214728082163326C2FF0C73f4a871
const SWAP_CONTRACT_ABI: &str = include_str!("eth/swap_contract_abi.json");
Expand Down Expand Up @@ -4441,11 +4441,11 @@ impl EthCoin {

#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
pub struct EthTxFeeDetails {
coin: String,
gas: u64,
pub coin: String,
pub gas: u64,
/// WEI units per 1 gas
gas_price: BigDecimal,
total_fee: BigDecimal,
pub gas_price: BigDecimal,
pub total_fee: BigDecimal,
}

impl EthTxFeeDetails {
Expand Down
Loading