Skip to content

Atomic swaps: restore offer publishing, UI fixes, generic Ethereum RPC settings, any-asset/any-token swaps #1269

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

Open
Maxnflaxl wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Atomic swaps: restore offer publishing, UI fixes, generic Ethereum RPC settings, any-asset/any-token swaps #1269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8b5b9ea
#1267(#1129): swaps: SEND/RECEIVE -> I SEND/I RECEIVE
Maxnflaxl Jul 15, 2026
6d271de
#1267(#1107): settings: rename "Ethereum node" section to "Ethereum"
Maxnflaxl Jul 15, 2026
88f2929
#1267(#1103): swap details: show in-progress coins-auto-unlock safety…
Maxnflaxl Jul 15, 2026
dfa3e61
#1267(#1268): settings: Infura/Custom RPC switcher with connection check
Maxnflaxl Jul 15, 2026
274cc5d
#1267(#1017, #1073): bump beam submodule to swap fixes (issue/2070)
Maxnflaxl Jul 15, 2026
c6c9ccb
#1267(#1166): swaps UI: any Confidential Asset and any ERC-20 token
Maxnflaxl Jul 16, 2026
47e3050
#1267: settings: don't unfold every coin section from "Connect more c…
Maxnflaxl Jul 16, 2026
2ad341e
#1267: FeeInput: keep the fee unit label inside the row layout
Maxnflaxl Jul 16, 2026
8be50e3
#1267: swap fee panels: refresh recommended fee rate when estimates a…
Maxnflaxl Jul 16, 2026
9875b10
#1267: swaps: name the redeem-gas shortfall and show ETH-side fees in…
Maxnflaxl Jul 16, 2026
5d6ce10
#1267: swaps UI: dedupe shared token/fee helpers into swap_utils
Maxnflaxl Jul 17, 2026
1e9cb18
#1267: settings/fee helpers: collapse duplicated plumbing
Maxnflaxl Jul 17, 2026
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
2 changes: 1 addition & 1 deletion beam
Open in desktop
Submodule beam updated 69 files
+1 −1 core/fly_client.cpp
+9 −0 explorer/adapter.cpp
+1 −0 explorer/adapter.h
+125 −78 explorer/htm/BeamExplorer.htm
+6 −0 explorer/server.cpp
+ − mytest-utxo-image.bin
+ − mytest.db
+ − receiver_wallet.db
+ − sender_wallet.db
+3 −1 utility/cli/options.cpp
+1 −0 utility/cli/options.h
+30 −4 wallet/api/cli/api_cli_swap.h
+40 −0 wallet/api/cli/swap_eth_client.cpp
+16 −0 wallet/api/cli/swap_eth_client.h
+12 −0 wallet/api/i_swaps_provider.h
+15 −0 wallet/api/v6_0/v6_api_defs.h
+86 −5 wallet/api/v6_0/v6_api_swap_handle.cpp
+84 −0 wallet/api/v6_0/v6_api_swap_parse.cpp
+248 −34 wallet/cli/swaps.cpp
+4 −3 wallet/cli/swaps.h
+22 −0 wallet/client/extensions/offers_board/swap_offer.cpp
+9 −0 wallet/client/extensions/offers_board/swap_offer.h
+104 −5 wallet/client/extensions/offers_board/swap_offers_board.cpp
+1 −0 wallet/client/extensions/offers_board/swap_offers_board.h
+20 −0 wallet/client/wallet_client.cpp
+6 −1 wallet/client/wallet_client.h
+15 −0 wallet/core/common.h
+0 −1 wallet/core/strings_resources.cpp
+0 −1 wallet/core/strings_resources.h
+1 −0 wallet/transactions/swaps/CMakeLists.txt
+5 −3 wallet/transactions/swaps/bridges/bitcoin/bitcoin_core_016.cpp
+2 −2 wallet/transactions/swaps/bridges/bitcoin/bitcoin_core_016.h
+18 −4 wallet/transactions/swaps/bridges/bitcoin/bitcoin_side.cpp
+2 −2 wallet/transactions/swaps/bridges/bitcoin/bitcoin_side.h
+3 −3 wallet/transactions/swaps/bridges/bitcoin/bridge.h
+14 −0 wallet/transactions/swaps/bridges/bitcoin/common.cpp
+21 −0 wallet/transactions/swaps/bridges/bitcoin/common.h
+9 −8 wallet/transactions/swaps/bridges/bitcoin/electrum.cpp
+2 −2 wallet/transactions/swaps/bridges/bitcoin/electrum.h
+10 −3 wallet/transactions/swaps/bridges/ethereum/bridge.h
+116 −2 wallet/transactions/swaps/bridges/ethereum/client.cpp
+14 −3 wallet/transactions/swaps/bridges/ethereum/client.h
+134 −67 wallet/transactions/swaps/bridges/ethereum/common.cpp
+24 −1 wallet/transactions/swaps/bridges/ethereum/common.h
+190 −8 wallet/transactions/swaps/bridges/ethereum/ethereum_bridge.cpp
+5 −1 wallet/transactions/swaps/bridges/ethereum/ethereum_bridge.h
+20 −7 wallet/transactions/swaps/bridges/ethereum/ethereum_side.cpp
+3 −2 wallet/transactions/swaps/bridges/ethereum/ethereum_side.h
+136 −0 wallet/transactions/swaps/bridges/ethereum/rpc_endpoint.cpp
+37 −0 wallet/transactions/swaps/bridges/ethereum/rpc_endpoint.h
+39 −3 wallet/transactions/swaps/bridges/ethereum/settings.cpp
+6 −2 wallet/transactions/swaps/bridges/ethereum/settings.h
+15 −1 wallet/transactions/swaps/bridges/ethereum/settings_provider.cpp
+3 −1 wallet/transactions/swaps/bridges/ethereum/settings_provider.h
+46 −0 wallet/transactions/swaps/common.cpp
+35 −0 wallet/transactions/swaps/common.h
+42 −5 wallet/transactions/swaps/lock_tx_builder.cpp
+6 −1 wallet/transactions/swaps/shared_tx_builder.cpp
+162 −9 wallet/transactions/swaps/swap_transaction.cpp
+4 −0 wallet/transactions/swaps/swap_transaction.h
+2 −0 wallet/transactions/swaps/utils.cpp
+2 −1 wallet/unittests/CMakeLists.txt
+53 −4 wallet/unittests/bitcoin_rpc_test.cpp
+213 −0 wallet/unittests/eth_rpc_endpoint_test.cpp
+452 −0 wallet/unittests/swap_board_test.cpp
+2,571 −2,138 wallet/unittests/swap_test.cpp
+2 −1 wallet/unittests/test_helpers.h
+9 −0 wallet/unittests/wallet_api_test.cpp
+1 −0 wallet/unittests/wallet_test.cpp
158 changes: 140 additions & 18 deletions ui/i18n/be_BY.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,14 +918,6 @@
<source>Password</source>
<translation>Пароль</translation>
</message>
<message id="receive-amount-swap-label">
<source>Receive amount</source>
<translation>Сума атрымання</translation>
</message>
<message id="sent-amount-label">
<source>Send amount</source>
<translation>Сума адпраўкі</translation>
</message>
<message id="general-rate">
<source>Exchange rate</source>
<translation>Абменны курс</translation>
Expand Down Expand Up @@ -2074,8 +2066,9 @@ Your version is: %2. Please, check for updates.</source>
<translation>Ethereum</translation>
</message>
<message id="settings-swap-ethereum-node">
<source>Ethereum node</source>
<translation>Вузел Ethereum</translation>
<source>Ethereum</source>
<oldsource>Ethereum node</oldsource>
<translation type="unfinished">Вузел Ethereum</translation>
</message>
<message id="ethereum-show-seed-title">
<source>Ethereum seed phrase</source>
Expand Down Expand Up @@ -2223,10 +2216,6 @@ Please try again later or create an offer yourself.</source>
<translation>На дадзены момант няма актыўных прапаноў.
Паўтарыце спробу пазней альбо стварыце прапанову самастойна.</translation>
</message>
<message id="atomic-swap-amount-send">
<source>Send</source>
<translation>Адправіць</translation>
</message>
<message id="atomic-swap-all-transactions-tab">
<source>All</source>
<translation>Усе</translation>
Expand Down Expand Up @@ -3595,10 +3584,6 @@ Please, restart the wallet and try again.</source>
<source>updating</source>
<translation>абнаўленне</translation>
</message>
<message id="general-receive">
<source>Receive</source>
<translation>Атрымаць</translation>
</message>
<message id="swap-rate">
<source>Rate</source>
<translation>Курс</translation>
Expand Down Expand Up @@ -3965,5 +3950,142 @@ Connect your Hardware Wallet to finalize the transaction.</source>
<source>Couldn&apos;t extract the DApp files.</source>
<translation>Не ўдалося распакаваць файлы DApp.</translation>
</message>
<message id="atomic-swap-i-send">
<source>I send</source>
<translation type="unfinished"></translation>
</message>
<message id="atomic-swap-i-receive">
<source>I receive</source>
<translation type="unfinished"></translation>
</message>
<message id="swap-details-unlock-note">
<source>While the swap is in progress, if the other side goes offline your coins will be automatically unlocked in %1 at most.</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-eth-infura">
<source>Infura</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-eth-custom-rpc">
<source>Custom RPC</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-eth-rpc-endpoint">
<source>Ethereum RPC endpoint</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-eth-rpc-note">
<source>Works with any Ethereum JSON-RPC endpoint. Keyless public options: ethereum-rpc.publicnode.com, eth.drpc.org, rpc.mevblocker.io - or run your own node.</source>
<oldsource>Supports Infura, Alchemy, QuickNode, Chainstack, Ankr, or your own Ethereum node.</oldsource>
<translation type="unfinished"></translation>
</message>
<message id="settings-eth-check-connection">
<source>Check connection</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-eth-endpoint-failed">
<source>Unable to connect</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-eth-chain-mainnet">
<source>Ethereum Mainnet</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-eth-chain-sepolia">
<source>Sepolia Testnet</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-eth-chain-other">
<source>chain %1</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-eth-endpoint-ok">
<source>Connected to %1. Latest block: %2</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-eth-endpoint-wrong-network">
<source>Connected to %1, but Ethereum Mainnet is required</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-swap-token-section-title">
<source>Custom ERC-20 tokens</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-swap-token-remove">
<source>remove</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-swap-token-address-placeholder">
<source>0x contract address</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-swap-token-lookup">
<source>Look up</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-swap-token-add">
<source>Add</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-swap-token-info">
<source>%1, %2 decimals</source>
<translation type="unfinished"></translation>
</message>
<message id="swap-accept-token-title">
<source>Token</source>
<translation type="unfinished">Токен</translation>
</message>
<message id="swap-accept-token-contract-label">
<source>Contract address</source>
<translation type="unfinished"></translation>
</message>
<message id="swap-accept-token-symbol-label">
<source>Symbol / decimals</source>
<translation type="unfinished"></translation>
</message>
<message id="swap-accept-token-warning">
<source>Verify this token contract address carefully. Anyone can create a token with any name.</source>
<translation type="unfinished"></translation>
</message>
<message id="swap-accept-asset-title">
<source>Confidential Asset</source>
<translation type="unfinished"></translation>
</message>
<message id="swap-accept-asset-id-unit">
<source>Asset id %1, unit %2</source>
<translation type="unfinished"></translation>
</message>
<message id="swap-accept-asset-beam-fee">
<source>You are receiving a Confidential Asset. A small BEAM balance is required to pay the redeem transaction fee.</source>
<translation type="unfinished"></translation>
</message>
<message id="swap-accept-token-warning-confirm">
<source>%1 contract: %2. Verify this token contract address carefully. Anyone can create a token with any name.</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-swap-token-invalid-address">
<source>Invalid contract address</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-swap-token-builtin">
<source>built-in</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-swap-token-add-open">
<source>+ Add token</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-swap-token-add-cancel">
<source>cancel</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-swap-token-already-added">
<source>This token is already supported</source>
<translation type="unfinished"></translation>
</message>
<message id="swap-not-enough-eth-redeem">
<source>Not enough ETH to pay the redeem transaction fee (%1 needed)</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>
158 changes: 140 additions & 18 deletions ui/i18n/cs_CZ.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,14 +918,6 @@
<source>Password</source>
<translation>Heslo</translation>
</message>
<message id="receive-amount-swap-label">
<source>Receive amount</source>
<translation>Přijmout částku</translation>
</message>
<message id="sent-amount-label">
<source>Send amount</source>
<translation>Odeslat částku</translation>
</message>
<message id="general-rate">
<source>Exchange rate</source>
<translation>Směnný kurz</translation>
Expand Down Expand Up @@ -2073,8 +2065,9 @@ Vaše verze je: %2. Zkontrolujte prosím aktualizace.</translation>
<translation>Ethereum</translation>
</message>
<message id="settings-swap-ethereum-node">
<source>Ethereum node</source>
<translation>Ethereum node</translation>
<source>Ethereum</source>
<oldsource>Ethereum node</oldsource>
<translation type="unfinished">Ethereum node</translation>
</message>
<message id="ethereum-show-seed-title">
<source>Ethereum seed phrase</source>
Expand Down Expand Up @@ -2222,10 +2215,6 @@ Please try again later or create an offer yourself.</source>
<translation>Momentálně nejsou žádné aktivní nabídky.
Zkuste to prosím později nebo vytvořte svou nabídku.</translation>
</message>
<message id="atomic-swap-amount-send">
<source>Send</source>
<translation>Odeslat</translation>
</message>
<message id="atomic-swap-all-transactions-tab">
<source>All</source>
<translation>Všechny</translation>
Expand Down Expand Up @@ -3595,10 +3584,6 @@ Please, restart the wallet and try again.</translation>
<source>updating</source>
<translation>probíhá aktualizace</translation>
</message>
<message id="general-receive">
<source>Receive</source>
<translation>Přijmout</translation>
</message>
<message id="swap-rate">
<source>Rate</source>
<translation>Sazba</translation>
Expand Down Expand Up @@ -3965,5 +3950,142 @@ Connect your Hardware Wallet to finalize the transaction.</translation>
<source>Couldn&apos;t extract the DApp files.</source>
<translation>Soubory DApp se nepodařilo rozbalit.</translation>
</message>
<message id="atomic-swap-i-send">
<source>I send</source>
<translation type="unfinished"></translation>
</message>
<message id="atomic-swap-i-receive">
<source>I receive</source>
<translation type="unfinished"></translation>
</message>
<message id="swap-details-unlock-note">
<source>While the swap is in progress, if the other side goes offline your coins will be automatically unlocked in %1 at most.</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-eth-infura">
<source>Infura</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-eth-custom-rpc">
<source>Custom RPC</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-eth-rpc-endpoint">
<source>Ethereum RPC endpoint</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-eth-rpc-note">
<source>Works with any Ethereum JSON-RPC endpoint. Keyless public options: ethereum-rpc.publicnode.com, eth.drpc.org, rpc.mevblocker.io - or run your own node.</source>
<oldsource>Supports Infura, Alchemy, QuickNode, Chainstack, Ankr, or your own Ethereum node.</oldsource>
<translation type="unfinished"></translation>
</message>
<message id="settings-eth-check-connection">
<source>Check connection</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-eth-endpoint-failed">
<source>Unable to connect</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-eth-chain-mainnet">
<source>Ethereum Mainnet</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-eth-chain-sepolia">
<source>Sepolia Testnet</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-eth-chain-other">
<source>chain %1</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-eth-endpoint-ok">
<source>Connected to %1. Latest block: %2</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-eth-endpoint-wrong-network">
<source>Connected to %1, but Ethereum Mainnet is required</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-swap-token-section-title">
<source>Custom ERC-20 tokens</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-swap-token-remove">
<source>remove</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-swap-token-address-placeholder">
<source>0x contract address</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-swap-token-lookup">
<source>Look up</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-swap-token-add">
<source>Add</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-swap-token-info">
<source>%1, %2 decimals</source>
<translation type="unfinished"></translation>
</message>
<message id="swap-accept-token-title">
<source>Token</source>
<translation type="unfinished">Token</translation>
</message>
<message id="swap-accept-token-contract-label">
<source>Contract address</source>
<translation type="unfinished"></translation>
</message>
<message id="swap-accept-token-symbol-label">
<source>Symbol / decimals</source>
<translation type="unfinished"></translation>
</message>
<message id="swap-accept-token-warning">
<source>Verify this token contract address carefully. Anyone can create a token with any name.</source>
<translation type="unfinished"></translation>
</message>
<message id="swap-accept-asset-title">
<source>Confidential Asset</source>
<translation type="unfinished"></translation>
</message>
<message id="swap-accept-asset-id-unit">
<source>Asset id %1, unit %2</source>
<translation type="unfinished"></translation>
</message>
<message id="swap-accept-asset-beam-fee">
<source>You are receiving a Confidential Asset. A small BEAM balance is required to pay the redeem transaction fee.</source>
<translation type="unfinished"></translation>
</message>
<message id="swap-accept-token-warning-confirm">
<source>%1 contract: %2. Verify this token contract address carefully. Anyone can create a token with any name.</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-swap-token-invalid-address">
<source>Invalid contract address</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-swap-token-builtin">
<source>built-in</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-swap-token-add-open">
<source>+ Add token</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-swap-token-add-cancel">
<source>cancel</source>
<translation type="unfinished"></translation>
</message>
<message id="settings-swap-token-already-added">
<source>This token is already supported</source>
<translation type="unfinished"></translation>
</message>
<message id="swap-not-enough-eth-redeem">
<source>Not enough ETH to pay the redeem transaction fee (%1 needed)</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>
Loading
Loading