diff --git a/.cargo/config.toml b/.cargo/config.toml
index 5704896780..d59b360d40 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -2,7 +2,7 @@
JEMALLOC_SYS_WITH_MALLOC_CONF = "background_thread:true,narenas:1,tcache:false,dirty_decay_ms:0,muzzy_decay_ms:0,metadata_thp:auto"
[target.'cfg(all())']
-rustflags = [ "-Zshare-generics=y" ]
+rustflags = [ "-Zshare-generics=y", '--cfg=curve25519_dalek_backend="fiat"' ]
# # Install lld using package manager
# [target.x86_64-unknown-linux-gnu]
@@ -25,3 +25,6 @@ rustflags = [ "-Zshare-generics=y" ]
[target.wasm32-unknown-unknown]
runner = 'wasm-bindgen-test-runner'
rustflags = [ "--cfg=web_sys_unstable_apis" ]
+
+[target.x86_64-pc-windows-msvc]
+rustflags = ["-Ctarget-feature=+crt-static"]
diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml
index 585f9d4856..0849cca89a 100644
--- a/.github/workflows/dev-build.yml
+++ b/.github/workflows/dev-build.yml
@@ -51,17 +51,6 @@ jobs:
- name: Build
run: cargo build --release
- - name: Compress mm2 build output
- env:
- AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
- if: ${{ env.AVAILABLE != '' }}
- run: |
- NAME="mm2_$KDF_BUILD_TAG-linux-x86-64.zip"
- zip $NAME target/release/mm2 -j
- SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
- mkdir $SAFE_DIR_NAME
- mv $NAME ./$SAFE_DIR_NAME/
-
- name: Compress kdf build output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
@@ -70,6 +59,7 @@ jobs:
NAME="kdf_$KDF_BUILD_TAG-linux-x86-64.zip"
zip $NAME target/release/kdf -j
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+ mkdir $SAFE_DIR_NAME
mv $NAME ./$SAFE_DIR_NAME/
- name: Upload build artifact
@@ -125,16 +115,6 @@ jobs:
- name: Build
run: cargo build --release --target x86_64-apple-darwin
- - name: Compress mm2 build output
- env:
- AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
- if: ${{ env.AVAILABLE != '' }}
- run: |
- NAME="mm2_$KDF_BUILD_TAG-mac-x86-64.zip"
- zip $NAME target/x86_64-apple-darwin/release/mm2 -j
- SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
- mkdir $SAFE_DIR_NAME
- mv $NAME ./$SAFE_DIR_NAME/
- name: Compress kdf build output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
@@ -143,6 +123,7 @@ jobs:
NAME="kdf_$KDF_BUILD_TAG-mac-x86-64.zip"
zip $NAME target/x86_64-apple-darwin/release/kdf -j
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+ mkdir $SAFE_DIR_NAME
mv $NAME ./$SAFE_DIR_NAME/
- name: Upload build artifact
@@ -186,17 +167,6 @@ jobs:
- name: Build
run: cargo build --release --target aarch64-apple-darwin
- - name: Compress mm2 build output
- env:
- AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
- if: ${{ env.AVAILABLE != '' }}
- run: |
- NAME="mm2_$KDF_BUILD_TAG-mac-arm64.zip"
- zip $NAME target/aarch64-apple-darwin/release/mm2 -j
- SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
- mkdir $SAFE_DIR_NAME
- mv $NAME ./$SAFE_DIR_NAME/
-
- name: Compress kdf build output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
@@ -205,6 +175,7 @@ jobs:
NAME="kdf_$KDF_BUILD_TAG-mac-arm64.zip"
zip $NAME target/aarch64-apple-darwin/release/kdf -j
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+ mkdir $SAFE_DIR_NAME
mv $NAME ./$SAFE_DIR_NAME/
- name: Upload build artifact
@@ -247,25 +218,15 @@ jobs:
- name: Build
run: cargo build --release
- - name: Compress mm2 build output
- env:
- AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
- if: ${{ env.AVAILABLE != '' }}
- run: |
- $NAME="mm2_$Env:KDF_BUILD_TAG-win-x86-64.zip"
- 7z a $NAME .\target\release\mm2.exe .\target\release\*.dll
- $SAFE_DIR_NAME = $Env:BRANCH_NAME -replace '/', '-'
- mkdir $SAFE_DIR_NAME
- mv $NAME ./$SAFE_DIR_NAME/
-
- name: Compress kdf build output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
if: ${{ env.AVAILABLE != '' }}
run: |
$NAME="kdf_$Env:KDF_BUILD_TAG-win-x86-64.zip"
- 7z a $NAME .\target\release\kdf.exe .\target\release\*.dll
+ 7z a $NAME .\target\release\kdf.exe
$SAFE_DIR_NAME = $Env:BRANCH_NAME -replace '/', '-'
+ mkdir $SAFE_DIR_NAME
mv $NAME ./$SAFE_DIR_NAME/
- name: Upload build artifact
@@ -309,18 +270,6 @@ jobs:
- name: Build
run: cargo rustc --target x86_64-apple-darwin --lib --release --package mm2_bin_lib --crate-type=staticlib
- - name: Compress mm2 build output
- env:
- AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
- if: ${{ env.AVAILABLE != '' }}
- run: |
- NAME="mm2_$KDF_BUILD_TAG-mac-dylib-x86-64.zip"
- cp target/x86_64-apple-darwin/release/libkdflib.a target/x86_64-apple-darwin/release/libmm2.a
- zip $NAME target/x86_64-apple-darwin/release/libmm2.a -j
- SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
- mkdir $SAFE_DIR_NAME
- mv $NAME ./$SAFE_DIR_NAME/
-
- name: Compress kdf build output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
@@ -330,6 +279,7 @@ jobs:
mv target/x86_64-apple-darwin/release/libkdflib.a target/x86_64-apple-darwin/release/libkdf.a
zip $NAME target/x86_64-apple-darwin/release/libkdf.a -j
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+ mkdir $SAFE_DIR_NAME
mv $NAME ./$SAFE_DIR_NAME/
- name: Upload build artifact
@@ -438,18 +388,6 @@ jobs:
- name: Build
run: cargo rustc --target aarch64-apple-ios --lib --release --package mm2_bin_lib --crate-type=staticlib
- - name: Compress mm2 build output
- env:
- AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
- if: ${{ env.AVAILABLE != '' }}
- run: |
- NAME="mm2_$KDF_BUILD_TAG-ios-aarch64.zip"
- cp target/aarch64-apple-ios/release/libkdflib.a target/aarch64-apple-ios/release/libmm2.a
- zip $NAME target/aarch64-apple-ios/release/libmm2.a -j
- SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
- mkdir $SAFE_DIR_NAME
- mv $NAME ./$SAFE_DIR_NAME/
-
- name: Compress kdf build output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
@@ -459,6 +397,7 @@ jobs:
mv target/aarch64-apple-ios/release/libkdflib.a target/aarch64-apple-ios/release/libkdf.a
zip $NAME target/aarch64-apple-ios/release/libkdf.a -j
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+ mkdir $SAFE_DIR_NAME
mv $NAME ./$SAFE_DIR_NAME/
- name: Upload build artifact
@@ -516,18 +455,6 @@ jobs:
export PATH=$PATH:/android-ndk/bin
CC_aarch64_linux_android=aarch64-linux-android21-clang CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android21-clang cargo rustc --target=aarch64-linux-android --lib --release --crate-type=staticlib --package mm2_bin_lib
- - name: Compress mm2 build output
- env:
- AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
- if: ${{ env.AVAILABLE != '' }}
- run: |
- NAME="mm2_$KDF_BUILD_TAG-android-aarch64.zip"
- cp target/aarch64-linux-android/release/libkdflib.a target/aarch64-linux-android/release/libmm2.a
- zip $NAME target/aarch64-linux-android/release/libmm2.a -j
- SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
- mkdir $SAFE_DIR_NAME
- mv $NAME ./$SAFE_DIR_NAME/
-
- name: Compress kdf build output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
@@ -537,6 +464,7 @@ jobs:
mv target/aarch64-linux-android/release/libkdflib.a target/aarch64-linux-android/release/libkdf.a
zip $NAME target/aarch64-linux-android/release/libkdf.a -j
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+ mkdir $SAFE_DIR_NAME
mv $NAME ./$SAFE_DIR_NAME/
- name: Upload build artifact
@@ -594,18 +522,6 @@ jobs:
export PATH=$PATH:/android-ndk/bin
CC_armv7_linux_androideabi=armv7a-linux-androideabi21-clang CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi21-clang cargo rustc --target=armv7-linux-androideabi --lib --release --crate-type=staticlib --package mm2_bin_lib
- - name: Compress mm2 build output
- env:
- AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
- if: ${{ env.AVAILABLE != '' }}
- run: |
- NAME="mm2_$KDF_BUILD_TAG-android-armv7.zip"
- cp target/armv7-linux-androideabi/release/libkdflib.a target/armv7-linux-androideabi/release/libmm2.a
- zip $NAME target/armv7-linux-androideabi/release/libmm2.a -j
- SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
- mkdir $SAFE_DIR_NAME
- mv $NAME ./$SAFE_DIR_NAME/
-
- name: Compress kdf build output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
@@ -615,6 +531,7 @@ jobs:
mv target/armv7-linux-androideabi/release/libkdflib.a target/armv7-linux-androideabi/release/libkdf.a
zip $NAME target/armv7-linux-androideabi/release/libkdf.a -j
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+ mkdir $SAFE_DIR_NAME
mv $NAME ./$SAFE_DIR_NAME/
- name: Upload build artifact
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index 7fec248c88..75e9262b55 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -51,19 +51,12 @@ jobs:
- name: Build
run: cargo build --release
- - name: Compress mm2 build output
- run: |
- NAME="mm2_$KDF_BUILD_TAG-linux-x86-64.zip"
- zip $NAME target/release/mm2 -j
- SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
- mkdir $SAFE_DIR_NAME
- mv $NAME ./$SAFE_DIR_NAME/
-
- name: Compress kdf build output
run: |
NAME="kdf_$KDF_BUILD_TAG-linux-x86-64.zip"
zip $NAME target/release/kdf -j
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+ mkdir $SAFE_DIR_NAME
mv $NAME ./$SAFE_DIR_NAME/
- name: Upload build artifact
@@ -116,19 +109,12 @@ jobs:
- name: Build
run: cargo build --release --target x86_64-apple-darwin
- - name: Compress mm2 build output
- run: |
- NAME="mm2_$KDF_BUILD_TAG-mac-x86-64.zip"
- zip $NAME target/x86_64-apple-darwin/release/mm2 -j
- SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
- mkdir $SAFE_DIR_NAME
- mv $NAME ./$SAFE_DIR_NAME/
-
- name: Compress kdf build output
run: |
NAME="kdf_$KDF_BUILD_TAG-mac-x86-64.zip"
zip $NAME target/x86_64-apple-darwin/release/kdf -j
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+ mkdir $SAFE_DIR_NAME
mv $NAME ./$SAFE_DIR_NAME/
- name: Upload build artifact
@@ -172,19 +158,12 @@ jobs:
- name: Build
run: cargo build --release --target aarch64-apple-darwin
- - name: Compress mm2 build output
- run: |
- NAME="mm2_$KDF_BUILD_TAG-mac-arm64.zip"
- zip $NAME target/aarch64-apple-darwin/release/mm2 -j
- SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
- mkdir $SAFE_DIR_NAME
- mv $NAME ./$SAFE_DIR_NAME/
-
- name: Compress kdf build output
run: |
NAME="kdf_$KDF_BUILD_TAG-mac-arm64.zip"
zip $NAME target/aarch64-apple-darwin/release/kdf -j
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+ mkdir $SAFE_DIR_NAME
mv $NAME ./$SAFE_DIR_NAME/
- name: Upload build artifact
@@ -227,19 +206,12 @@ jobs:
- name: Build
run: cargo build --release
- - name: Compress mm2 build output
- run: |
- $NAME="mm2_$Env:KDF_BUILD_TAG-win-x86-64.zip"
- 7z a $NAME .\target\release\mm2.exe .\target\release\*.dll
- $SAFE_DIR_NAME = $Env:BRANCH_NAME -replace '/', '-'
- mkdir $SAFE_DIR_NAME
- mv $NAME ./$SAFE_DIR_NAME/
-
- name: Compress kdf build output
run: |
$NAME="kdf_$Env:KDF_BUILD_TAG-win-x86-64.zip"
7z a $NAME .\target\release\kdf.exe .\target\release\*.dll
$SAFE_DIR_NAME = $Env:BRANCH_NAME -replace '/', '-'
+ mkdir $SAFE_DIR_NAME
mv $NAME ./$SAFE_DIR_NAME/
- name: Upload build artifact
@@ -283,21 +255,13 @@ jobs:
- name: Build
run: cargo rustc --target x86_64-apple-darwin --lib --release --package mm2_bin_lib --crate-type=staticlib
- - name: Compress mm2 build output
- run: |
- NAME="mm2_$KDF_BUILD_TAG-mac-dylib-x86-64.zip"
- cp target/x86_64-apple-darwin/release/libkdflib.a target/x86_64-apple-darwin/release/libmm2.a
- zip $NAME target/x86_64-apple-darwin/release/libmm2.a -j
- SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
- mkdir $SAFE_DIR_NAME
- mv $NAME ./$SAFE_DIR_NAME/
-
- name: Compress kdf build output
run: |
NAME="kdf_$KDF_BUILD_TAG-mac-dylib-x86-64.zip"
mv target/x86_64-apple-darwin/release/libkdflib.a target/x86_64-apple-darwin/release/libkdf.a
zip $NAME target/x86_64-apple-darwin/release/libkdf.a -j
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+ mkdir $SAFE_DIR_NAME
mv $NAME ./$SAFE_DIR_NAME/
- name: Upload build artifact
@@ -403,21 +367,13 @@ jobs:
- name: Build
run: cargo rustc --target aarch64-apple-ios --lib --release --package mm2_bin_lib --crate-type=staticlib
- - name: Compress mm2 build output
- run: |
- NAME="mm2_$KDF_BUILD_TAG-ios-aarch64.zip"
- mv target/aarch64-apple-ios/release/libkdflib.a target/aarch64-apple-ios/release/libmm2.a
- zip $NAME target/aarch64-apple-ios/release/libmm2.a -j
- SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
- mkdir $SAFE_DIR_NAME
- mv $NAME ./$SAFE_DIR_NAME/
-
- name: Compress kdf build output
run: |
NAME="kdf_$KDF_BUILD_TAG-ios-aarch64.zip"
mv target/aarch64-apple-ios/release/libkdflib.a target/aarch64-apple-ios/release/libkdf.a
zip $NAME target/aarch64-apple-ios/release/libkdf.a -j
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+ mkdir $SAFE_DIR_NAME
mv $NAME ./$SAFE_DIR_NAME/
- name: Upload build artifact
@@ -475,21 +431,13 @@ jobs:
export PATH=$PATH:/android-ndk/bin
CC_aarch64_linux_android=aarch64-linux-android21-clang CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android21-clang cargo rustc --target=aarch64-linux-android --lib --release --crate-type=staticlib --package mm2_bin_lib
- - name: Compress mm2 build output
- run: |
- NAME="mm2_$KDF_BUILD_TAG-android-aarch64.zip"
- mv target/aarch64-linux-android/release/libkdflib.a target/aarch64-linux-android/release/libmm2.a
- zip $NAME target/aarch64-linux-android/release/libmm2.a -j
- SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
- mkdir $SAFE_DIR_NAME
- mv $NAME ./$SAFE_DIR_NAME/
-
- name: Compress kdf build output
run: |
NAME="kdf_$KDF_BUILD_TAG-android-aarch64.zip"
mv target/aarch64-linux-android/release/libkdflib.a target/aarch64-linux-android/release/libkdf.a
zip $NAME target/aarch64-linux-android/release/libkdf.a -j
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+ mkdir $SAFE_DIR_NAME
mv $NAME ./$SAFE_DIR_NAME/
- name: Upload build artifact
@@ -547,21 +495,13 @@ jobs:
export PATH=$PATH:/android-ndk/bin
CC_armv7_linux_androideabi=armv7a-linux-androideabi21-clang CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi21-clang cargo rustc --target=armv7-linux-androideabi --lib --release --crate-type=staticlib --package mm2_bin_lib
- - name: Compress mm2 build output
- run: |
- NAME="mm2_$KDF_BUILD_TAG-android-armv7.zip"
- mv target/armv7-linux-androideabi/release/libkdflib.a target/armv7-linux-androideabi/release/libmm2.a
- zip $NAME target/armv7-linux-androideabi/release/libmm2.a -j
- SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
- mkdir $SAFE_DIR_NAME
- mv $NAME ./$SAFE_DIR_NAME/
-
- name: Compress kdf build output
run: |
NAME="kdf_$KDF_BUILD_TAG-android-armv7.zip"
mv target/armv7-linux-androideabi/release/libkdflib.a target/armv7-linux-androideabi/release/libkdf.a
zip $NAME target/armv7-linux-androideabi/release/libkdf.a -j
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+ mkdir $SAFE_DIR_NAME
mv $NAME ./$SAFE_DIR_NAME/
- name: Upload build artifact
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c0da60616b..bc242f6547 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -268,4 +268,4 @@ jobs:
uses: ./.github/actions/build-cache
- name: Test
- run: WASM_BINDGEN_TEST_TIMEOUT=600 GECKODRIVER=/bin/geckodriver wasm-pack test --firefox --headless mm2src/mm2_main
+ run: WASM_BINDGEN_TEST_TIMEOUT=1200 GECKODRIVER=/bin/geckodriver wasm-pack test --firefox --headless mm2src/mm2_main
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 132dda9919..831bc7bc68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,105 @@
+## v2.5.0-beta - 2025-07-04
+
+### Features:
+
+**WalletConnect Integration**:
+- WalletConnect v2 support for EVM and Cosmos coins was implemented, enabling wallet connection and transaction signing via the WalletConnect protocol. [#2223](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2223) [#2485](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2485) [#2508](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2508)
+
+---
+
+### Work in Progress (WIP) Features:
+
+**Cosmos Network and IBC Swaps**:
+- Pre-swap validation logic was implemented for maker order creation, requiring HTLC assets and healthy IBC channels on the Cosmos network, with all changes gated behind the `ibc-routing-for-swaps` feature. [#2459](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2459)
+- The taker and maker order types were extended with an `order_metadata` field to carry protocol/IBC details, and cross-checks for IBC channels were added (also feature-gated), enabling both parties to validate IBC routing before a swap. [#2476](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2476)
+
+**TRON Integration**:
+- Initial groundwork for TRON integration was started, including the addition of basic structures and boilerplate code; no end-to-end functionality is yet available. [#2425](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2425)
+
+---
+
+### Enhancements/Fixes:
+
+**Event Streaming**:
+- Streamer IDs in the event-streaming system were strongly typed to improve type safety and code clarity. [#2441](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2441)
+
+**Peer-to-Peer Network**:
+- Hardcoded seed node IP addresses were removed from the peer-to-peer network configuration to improve maintainability. [#2439](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2439)
+
+**Orders and Trading Protocol**:
+- The minimum trading volume logic was revised to remove BTC-specific volume behavior, standardizing the calculation across all coins. [#2483](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2483)
+
+**Tendermint / Cosmos**:
+- A helper for generating internal transaction IDs for Tendermint transactions was introduced. [#2438](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2438)
+- The IBC channel handler was improved to enhance safety and reliability when interacting with IBC channels. [#2298](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2298)
+
+**Wallet**:
+- Unconfirmed z-coin notes are now correctly tracked. [#2331](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2331)
+- HD multi-address support for message signing was implemented, allowing message signatures from multiple derived addresses. [#2432](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2432) [#2474](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2474)
+- A `delete_wallet` RPC was introduced to securely remove wallets after password confirmation, while preventing the deletion of the currently active wallet. [#2497](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2497)
+- A race condition during the initialization of Trezor-based hardware wallets was resolved by ensuring the correct account and address are loaded before fetching the enabled address, preventing startup errors. [#2504](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2504)
+
+**UTXO**:
+- Validation of expected public keys for p2pk inputs was corrected, resolving an error in p2pk transaction processing. [#2408](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2408)
+- Transaction fee calculation and minimum relay fee handling for UTXO coins were improved for accurate fee estimation. [#2316](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2316)
+
+**EVM / ERC20**:
+- ETH address serialization in event streaming was updated to use the `AddrToString` trait for consistency. [#2440](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2440)
+
+**Pubkey Banning**:
+- Expirable bans for pubkeys were introduced, allowing temporary exclusion of certain public keys. [#2455](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2455)
+
+**RPC Interface**:
+- A unified interface was implemented for legacy and current RPC methods. [#2450](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2450)
+
+**DNS Resolution**:
+- IP resolution logic was improved to fail only if no IPv4 address is found. [#2487](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2487)
+
+**Database and File System**:
+- More replacements of `dbdir` with `address_dir` were made as part of an ongoing improvement to database architecture. [#2398](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2398)
+
+**Build and Dependency Management**:
+- Duplicated mm2 build artifacts were removed from the build process to reduce clutter. [#2448](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2448)
+- Static CRT linking was enabled for MSVC builds, improving the portability of Windows binaries. [#2464](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2464)
+- The `timed-map` dependency was bumped to version `1.4.1` for improved performance and stability. [#2413](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2413) [#2481](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2481)
+- The `base58` crate was removed and replaced with `bs58` throughout the codebase for consistency and security. [#2427](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2427)
+- Dependencies were reorganized using the `workspace.dependencies` feature for centralized management. [#2449](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2449)
+
+---
+
+### Other Changes:
+
+**Documentation**:
+- Old URLs referencing atomicDEX or previous documentation pages were updated throughout the documentation. [#2428](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2428)
+- A DeepWiki badge was added to the README to highlight documentation resources. [#2463](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2463)
+
+**Core Maintenance**:
+- Workspace dependencies were organized for consistent dependency management across the project. [#2449](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2449)
+- A unit test was added to validate DEX fee handling for ZCoin. [#2460](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2460)
+- Improved ERC20 token lookup to use platform ticker alongside contract address for proper token identification across platforms. [#2445](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2445)
+
+---
+
+### NB - Backwards compatibility breaking changes:
+
+**WalletConnect/EVM Coin Activation Policy**:
+- The `priv_key_policy` field for EVM coin activation now requires the new enum variant format: `"priv_key_policy": { "type": "ContextPrivKey" }`. [#2223](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2223)
+
+**TRON/EVM Chain Specification**:
+- EVM coin configurations must now include `chain_id` inside the `protocol_data` field. Legacy `chain_id` fields are deprecated. [#2425](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2425)
+
+**mm2 Build Artifacts**:
+- The `mm2` binaries have been removed from build outputs. Users must reference new artifact locations. [#2448](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2448)
+
+**Seednode Configuration**:
+- Hardcoded seed nodes were removed. KDF will no longer connect to 8762 mainnet by default without proper `seednodes` configuration. [#2439](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2439)
+
+**IBC/Cosmos Changes**:
+- The `ibc_chains` and `ibc_transfer_channels` RPC endpoints have been removed. [#2459](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2459)
+- The `ibc_source_channel` field now requires numeric values only (e.g., `12` instead of `channel-12`). [#2459](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2459)
+
+---
+
## v2.4.0-beta - 2025-05-02
### Features:
diff --git a/Cargo.lock b/Cargo.lock
index e2ebd94a86..c6cd5560d8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -35,25 +35,14 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
name = "aead"
-version = "0.4.1"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "922b33332f54fc0ad13fa3e514601e8d30fb54e1f3eadc36643f6526db645621"
+checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
dependencies = [
+ "crypto-common",
"generic-array",
]
-[[package]]
-name = "aes"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
-dependencies = [
- "cfg-if 1.0.0",
- "cipher 0.3.0",
- "cpufeatures 0.2.11",
- "opaque-debug",
-]
-
[[package]]
name = "aes"
version = "0.8.3"
@@ -61,19 +50,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2"
dependencies = [
"cfg-if 1.0.0",
- "cipher 0.4.4",
- "cpufeatures 0.2.11",
+ "cipher",
+ "cpufeatures",
]
[[package]]
name = "aes-gcm"
-version = "0.9.2"
+version = "0.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc3be92e19a7ef47457b8e6f90707e12b6ac5d20c6f3866584fa3be0787d839f"
+checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1"
dependencies = [
"aead",
- "aes 0.7.5",
- "cipher 0.3.0",
+ "aes",
+ "cipher",
"ctr",
"ghash",
"subtle",
@@ -130,9 +119,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.42"
+version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
[[package]]
name = "argon2"
@@ -142,7 +131,7 @@ checksum = "17ba4cac0a46bc1d2912652a751c47f2a9f3a7fe89bcae2275d418f5270402f9"
dependencies = [
"base64ct",
"blake2",
- "cpufeatures 0.2.11",
+ "cpufeatures",
"password-hash",
"zeroize",
]
@@ -241,7 +230,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27"
dependencies = [
"proc-macro2",
- "quote 1.0.33",
+ "quote 1.0.37",
"syn 1.0.95",
]
@@ -258,8 +247,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "531b97fb4cd3dfdce92c35dedbfdc1f0b9d8091c8ca943d6dae340ef5012d514"
dependencies = [
"proc-macro2",
- "quote 1.0.33",
- "syn 2.0.38",
+ "quote 1.0.37",
+ "syn 2.0.77",
]
[[package]]
@@ -268,7 +257,7 @@ version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0de5164e5edbf51c45fb8c2d9664ae1c095cce1b265ecf7569093c0d66ef690"
dependencies = [
- "bytes 1.4.0",
+ "bytes",
"futures-sink",
"futures-util",
"memchr",
@@ -307,12 +296,12 @@ dependencies = [
"async-trait",
"axum-core",
"bitflags 1.3.2",
- "bytes 1.4.0",
+ "bytes",
"futures-util",
"http 0.2.12",
- "http-body 0.4.5",
+ "http-body",
"hyper",
- "itoa 1.0.10",
+ "itoa",
"matchit",
"memchr",
"mime",
@@ -333,10 +322,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
dependencies = [
"async-trait",
- "bytes 1.4.0",
+ "bytes",
"futures-util",
"http 0.2.12",
- "http-body 0.4.5",
+ "http-body",
"mime",
"rustversion",
"tower-layer",
@@ -370,12 +359,6 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
-[[package]]
-name = "base58"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6107fe1be6682a68940da878d9e9f5e90ca5745b3dec9fd1bb393c8777d4f581"
-
[[package]]
name = "base64"
version = "0.11.0"
@@ -681,16 +664,6 @@ version = "1.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-[[package]]
-name = "bytes"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
-dependencies = [
- "byteorder",
- "iovec",
-]
-
[[package]]
name = "bytes"
version = "1.4.0"
@@ -712,7 +685,7 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
dependencies = [
- "cipher 0.4.4",
+ "cipher",
]
[[package]]
@@ -735,25 +708,24 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chacha20"
-version = "0.8.2"
+version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6"
+checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818"
dependencies = [
"cfg-if 1.0.0",
- "cipher 0.3.0",
- "cpufeatures 0.2.11",
- "zeroize",
+ "cipher",
+ "cpufeatures",
]
[[package]]
name = "chacha20poly1305"
-version = "0.9.1"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5"
+checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
dependencies = [
"aead",
"chacha20",
- "cipher 0.3.0",
+ "cipher",
"poly1305",
"zeroize",
]
@@ -786,15 +758,6 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "cipher"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
-dependencies = [
- "generic-array",
-]
-
[[package]]
name = "cipher"
version = "0.4.4"
@@ -803,6 +766,7 @@ checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
dependencies = [
"crypto-common",
"inout",
+ "zeroize",
]
[[package]]
@@ -830,15 +794,15 @@ version = "0.1.0"
dependencies = [
"async-std",
"async-trait",
- "base58",
"base64 0.21.7",
"bip32",
"bitcoin",
"bitcoin_hashes",
"bitcrypto",
"blake2b_simd",
+ "bs58 0.4.0",
"byteorder",
- "bytes 0.4.12",
+ "bytes",
"cfg-if 1.0.0",
"chain",
"chrono",
@@ -849,7 +813,7 @@ dependencies = [
"db_common",
"derive_more",
"dirs",
- "ed25519-dalek",
+ "ed25519-dalek 1.0.1",
"enum_derives",
"ethabi",
"ethcore-transaction",
@@ -870,6 +834,7 @@ dependencies = [
"js-sys",
"jsonrpc-core",
"jubjub",
+ "kdf_walletconnect",
"keys",
"lazy_static",
"libc",
@@ -881,7 +846,6 @@ dependencies = [
"mm2_db",
"mm2_err_handle",
"mm2_event_stream",
- "mm2_git",
"mm2_io",
"mm2_metamask",
"mm2_metrics",
@@ -965,6 +929,7 @@ dependencies = [
"ethereum-types",
"futures 0.3.28",
"hex",
+ "kdf_walletconnect",
"lightning",
"lightning-background-processor",
"lightning-invoice",
@@ -977,6 +942,7 @@ dependencies = [
"parking_lot",
"rpc",
"rpc_task",
+ "secp256k1 0.24.3",
"ser_error",
"ser_error_derive",
"serde",
@@ -993,7 +959,7 @@ dependencies = [
"arrayref",
"async-trait",
"backtrace",
- "bytes 1.4.0",
+ "bytes",
"cc",
"cfg-if 1.0.0",
"chrono",
@@ -1008,7 +974,7 @@ dependencies = [
"gstuff",
"hex",
"http 0.2.12",
- "http-body 0.1.0",
+ "http-body",
"hyper",
"hyper-rustls 0.24.2",
"itertools",
@@ -1138,15 +1104,6 @@ dependencies = [
"thiserror",
]
-[[package]]
-name = "cpufeatures"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed00c67cb5d0a7d64a44f6ad2668db7e7530311dd53ea79bcd4fb022c64911c8"
-dependencies = [
- "libc",
-]
-
[[package]]
name = "cpufeatures"
version = "0.2.11"
@@ -1314,7 +1271,7 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
name = "crypto"
version = "1.0.0"
dependencies = [
- "aes 0.8.3",
+ "aes",
"argon2",
"arrayref",
"async-trait",
@@ -1325,7 +1282,7 @@ dependencies = [
"bs58 0.4.0",
"cbc",
"cfg-if 1.0.0",
- "cipher 0.4.4",
+ "cipher",
"common",
"derive_more",
"enum-primitive-derive",
@@ -1380,6 +1337,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
dependencies = [
"generic-array",
+ "rand_core 0.6.4",
"typenum",
]
@@ -1420,11 +1378,11 @@ dependencies = [
[[package]]
name = "ctr"
-version = "0.7.0"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a232f92a03f37dd7d7dd2adc67166c77e9cd88de5b019b9a9eecfaeaf7bfd481"
+checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
dependencies = [
- "cipher 0.3.0",
+ "cipher",
]
[[package]]
@@ -1453,18 +1411,31 @@ dependencies = [
[[package]]
name = "curve25519-dalek"
-version = "4.0.0-rc.1"
+version = "4.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d4ba9852b42210c7538b75484f9daa0655e9a3ac04f693747bb0f02cf3cfe16"
+checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
dependencies = [
"cfg-if 1.0.0",
+ "cpufeatures",
+ "curve25519-dalek-derive",
+ "digest 0.10.7",
"fiat-crypto",
- "packed_simd_2",
- "platforms",
+ "rustc_version 0.4.0",
"subtle",
"zeroize",
]
+[[package]]
+name = "curve25519-dalek-derive"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
+dependencies = [
+ "proc-macro2",
+ "quote 1.0.37",
+ "syn 2.0.77",
+]
+
[[package]]
name = "curve25519-dalek-ng"
version = "4.1.1"
@@ -1500,7 +1471,7 @@ dependencies = [
"codespan-reporting",
"lazy_static",
"proc-macro2",
- "quote 1.0.33",
+ "quote 1.0.37",
"scratch",
"syn 1.0.95",
]
@@ -1518,7 +1489,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b846f081361125bfc8dc9d3940c84e1fd83ba54bbca7b17cd29483c828be0704"
dependencies = [
"proc-macro2",
- "quote 1.0.33",
+ "quote 1.0.37",
"syn 1.0.95",
]
@@ -1541,7 +1512,7 @@ dependencies = [
"fnv",
"ident_case",
"proc-macro2",
- "quote 1.0.33",
+ "quote 1.0.37",
"strsim",
"syn 1.0.95",
]
@@ -1553,7 +1524,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
dependencies = [
"darling_core",
- "quote 1.0.33",
+ "quote 1.0.37",
"syn 1.0.95",
]
@@ -1615,7 +1586,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41cb0e6161ad61ed084a36ba71fbba9e3ac5aee3606fb607fe08da6acbcf3d8c"
dependencies = [
"proc-macro2",
- "quote 1.0.33",
+ "quote 1.0.37",
"syn 1.0.95",
]
@@ -1693,12 +1664,12 @@ dependencies = [
[[package]]
name = "ed25519"
-version = "1.5.2"
+version = "1.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369"
+checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
dependencies = [
"serde",
- "signature 1.4.0",
+ "signature 1.6.4",
]
[[package]]
@@ -1731,7 +1702,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
dependencies = [
"curve25519-dalek 3.2.0",
- "ed25519 1.5.2",
+ "ed25519 1.5.3",
"rand 0.7.3",
"serde",
"serde_bytes",
@@ -1739,6 +1710,21 @@ dependencies = [
"zeroize",
]
+[[package]]
+name = "ed25519-dalek"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
+dependencies = [
+ "curve25519-dalek 4.1.3",
+ "ed25519 2.2.3",
+ "rand_core 0.6.4",
+ "serde",
+ "sha2 0.10.7",
+ "subtle",
+ "zeroize",
+]
+
[[package]]
name = "edit-distance"
version = "2.1.0"
@@ -1791,9 +1777,9 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116"
dependencies = [
- "heck",
+ "heck 0.4.0",
"proc-macro2",
- "quote 1.0.33",
+ "quote 1.0.37",
"syn 1.0.95",
]
@@ -1804,7 +1790,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c375b9c5eadb68d0a6efee2999fef292f45854c3444c86f09d8ab086ba942b0e"
dependencies = [
"num-traits",
- "quote 1.0.33",
+ "quote 1.0.37",
"syn 1.0.95",
]
@@ -1814,7 +1800,7 @@ version = "0.1.0"
dependencies = [
"itertools",
"proc-macro2",
- "quote 1.0.33",
+ "quote 1.0.37",
"syn 1.0.95",
]
@@ -1834,7 +1820,7 @@ dependencies = [
[[package]]
name = "equihash"
version = "0.1.0"
-source = "git+https://github.com/KomodoPlatform/librustzcash.git?tag=k-1.4.2#4e030a0f44cc17f100bf5f019563be25c5b8755f"
+source = "git+https://github.com/komodoplatform/librustzcash.git?tag=k-1.4.2#4e030a0f44cc17f100bf5f019563be25c5b8755f"
dependencies = [
"blake2b_simd",
"byteorder",
@@ -2012,9 +1998,9 @@ dependencies = [
[[package]]
name = "fiat-crypto"
-version = "0.1.20"
+version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77"
+checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
[[package]]
name = "findshlibs"
@@ -2033,7 +2019,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"
dependencies = [
"byteorder",
- "rand 0.8.4",
+ "rand 0.8.5",
"rustc-hex",
"static_assertions",
]
@@ -2087,8 +2073,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26c4b37de5ae15812a764c958297cfc50f5c010438f60c6ce75d11b802abd404"
dependencies = [
"cbc",
- "cipher 0.4.4",
- "libm 0.2.7",
+ "cipher",
+ "libm",
"num-bigint",
"num-integer",
"num-traits",
@@ -2200,8 +2186,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
- "quote 1.0.33",
- "syn 2.0.38",
+ "quote 1.0.37",
+ "syn 2.0.77",
]
[[package]]
@@ -2315,9 +2301,9 @@ dependencies = [
[[package]]
name = "ghash"
-version = "0.4.2"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bbd60caa311237d508927dbba7594b483db3ef05faa55172fcf89b1bcda7853"
+checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1"
dependencies = [
"opaque-debug",
"polyval",
@@ -2392,7 +2378,7 @@ version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9"
dependencies = [
- "bytes 1.4.0",
+ "bytes",
"fnv",
"futures-core",
"futures-sink",
@@ -2469,7 +2455,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270"
dependencies = [
"base64 0.21.7",
- "bytes 1.4.0",
+ "bytes",
"headers-core",
"http 0.2.12",
"httpdate",
@@ -2492,6 +2478,12 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
[[package]]
name = "hermit-abi"
version = "0.1.14"
@@ -2531,6 +2523,15 @@ dependencies = [
"zeroize",
]
+[[package]]
+name = "hkdf"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
+dependencies = [
+ "hmac 0.12.1",
+]
+
[[package]]
name = "hmac"
version = "0.8.1"
@@ -2582,38 +2583,26 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "http"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0"
-dependencies = [
- "bytes 0.4.12",
- "fnv",
- "itoa 0.4.6",
-]
-
[[package]]
name = "http"
version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
dependencies = [
- "bytes 1.4.0",
+ "bytes",
"fnv",
- "itoa 1.0.10",
+ "itoa",
]
[[package]]
-name = "http-body"
-version = "0.1.0"
+name = "http"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d"
+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
dependencies = [
- "bytes 0.4.12",
- "futures 0.1.29",
- "http 0.1.21",
- "tokio-buf",
+ "bytes",
+ "fnv",
+ "itoa",
]
[[package]]
@@ -2622,7 +2611,7 @@ version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
dependencies = [
- "bytes 1.4.0",
+ "bytes",
"http 0.2.12",
"pin-project-lite 0.2.9",
]
@@ -2672,16 +2661,16 @@ version = "0.14.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4"
dependencies = [
- "bytes 1.4.0",
+ "bytes",
"futures-channel",
"futures-core",
"futures-util",
"h2",
"http 0.2.12",
- "http-body 0.4.5",
+ "http-body",
"httparse",
"httpdate",
- "itoa 1.0.10",
+ "itoa",
"pin-project-lite 0.2.9",
"socket2 0.4.9",
"tokio",
@@ -2848,7 +2837,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5dacb10c5b3bb92d46ba347505a9041e676bb20ad220101326bffb0c93031ee"
dependencies = [
"proc-macro2",
- "quote 1.0.33",
+ "quote 1.0.37",
"syn 1.0.95",
]
@@ -2910,15 +2899,6 @@ dependencies = [
"windows-sys 0.45.0",
]
-[[package]]
-name = "iovec"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
-dependencies = [
- "libc",
-]
-
[[package]]
name = "ipconfig"
version = "0.3.0"
@@ -2946,12 +2926,6 @@ dependencies = [
"either",
]
-[[package]]
-name = "itoa"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
-
[[package]]
name = "itoa"
version = "1.0.10"
@@ -3003,6 +2977,20 @@ dependencies = [
"serde_json",
]
+[[package]]
+name = "jsonwebtoken"
+version = "8.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378"
+dependencies = [
+ "base64 0.21.7",
+ "pem",
+ "ring 0.16.20",
+ "serde",
+ "serde_json",
+ "simple_asn1",
+]
+
[[package]]
name = "jubjub"
version = "0.5.1"
@@ -3029,6 +3017,47 @@ dependencies = [
"sha2 0.10.7",
]
+[[package]]
+name = "kdf_walletconnect"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "base64 0.21.7",
+ "cfg-if 1.0.0",
+ "chrono",
+ "common",
+ "db_common",
+ "derive_more",
+ "enum_derives",
+ "futures 0.3.28",
+ "hex",
+ "hkdf",
+ "js-sys",
+ "mm2_core",
+ "mm2_db",
+ "mm2_err_handle",
+ "mm2_test_helpers",
+ "pairing_api",
+ "parking_lot",
+ "rand 0.8.5",
+ "relay_client",
+ "relay_rpc",
+ "secp256k1 0.20.3",
+ "serde",
+ "serde_json",
+ "sha2 0.10.7",
+ "thiserror",
+ "timed-map",
+ "tokio",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-bindgen-test",
+ "wc_common",
+ "web-sys",
+ "x25519-dalek 2.0.1",
+]
+
[[package]]
name = "keccak"
version = "0.1.0"
@@ -3049,9 +3078,9 @@ dependencies = [
name = "keys"
version = "0.1.0"
dependencies = [
- "base58",
"bech32",
"bitcrypto",
+ "bs58 0.4.0",
"derive_more",
"lazy_static",
"primitives",
@@ -3096,12 +3125,6 @@ version = "0.2.169"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
-[[package]]
-name = "libm"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
-
[[package]]
name = "libm"
version = "0.2.7"
@@ -3113,7 +3136,7 @@ name = "libp2p"
version = "0.52.1"
source = "git+https://github.com/KomodoPlatform/rust-libp2p.git?tag=k-0.52.12#8bcc1fda79d56a2f398df3d45a29729b8ce0148d"
dependencies = [
- "bytes 1.4.0",
+ "bytes",
"futures 0.3.28",
"futures-timer",
"getrandom 0.2.9",
@@ -3181,7 +3204,7 @@ dependencies = [
"parking_lot",
"pin-project",
"quick-protobuf",
- "rand 0.8.4",
+ "rand 0.8.5",
"rw-stream-sink",
"smallvec 1.6.1",
"thiserror",
@@ -3218,7 +3241,7 @@ dependencies = [
"log",
"quick-protobuf",
"quick-protobuf-codec",
- "rand 0.8.4",
+ "rand 0.8.5",
"smallvec 1.6.1",
"thiserror",
]
@@ -3231,7 +3254,7 @@ dependencies = [
"asynchronous-codec",
"base64 0.21.7",
"byteorder",
- "bytes 1.4.0",
+ "bytes",
"either",
"fnv",
"futures 0.3.28",
@@ -3246,7 +3269,7 @@ dependencies = [
"prometheus-client",
"quick-protobuf",
"quick-protobuf-codec",
- "rand 0.8.4",
+ "rand 0.8.5",
"regex",
"sha2 0.10.7",
"smallvec 1.6.1",
@@ -3283,12 +3306,12 @@ checksum = "d2874d9c6575f1d7a151022af5c42bb0ffdcdfbafe0a6fd039de870b384835a2"
dependencies = [
"asn1_der",
"bs58 0.5.0",
- "ed25519-dalek",
+ "ed25519-dalek 1.0.1",
"libsecp256k1",
"log",
"multihash",
"quick-protobuf",
- "rand 0.8.4",
+ "rand 0.8.5",
"sha2 0.10.7",
"thiserror",
"zeroize",
@@ -3306,7 +3329,7 @@ dependencies = [
"libp2p-identity",
"libp2p-swarm",
"log",
- "rand 0.8.4",
+ "rand 0.8.5",
"smallvec 1.6.1",
"socket2 0.5.3",
"tokio",
@@ -3335,7 +3358,7 @@ name = "libp2p-noise"
version = "0.43.0"
source = "git+https://github.com/KomodoPlatform/rust-libp2p.git?tag=k-0.52.12#8bcc1fda79d56a2f398df3d45a29729b8ce0148d"
dependencies = [
- "bytes 1.4.0",
+ "bytes",
"curve25519-dalek 3.2.0",
"futures 0.3.28",
"libp2p-core",
@@ -3345,12 +3368,12 @@ dependencies = [
"multihash",
"once_cell",
"quick-protobuf",
- "rand 0.8.4",
+ "rand 0.8.5",
"sha2 0.10.7",
"snow",
"static_assertions",
"thiserror",
- "x25519-dalek",
+ "x25519-dalek 1.1.0",
"zeroize",
]
@@ -3367,7 +3390,7 @@ dependencies = [
"libp2p-identity",
"libp2p-swarm",
"log",
- "rand 0.8.4",
+ "rand 0.8.5",
"void",
]
@@ -3383,7 +3406,7 @@ dependencies = [
"libp2p-identity",
"libp2p-swarm",
"log",
- "rand 0.8.4",
+ "rand 0.8.5",
"smallvec 1.6.1",
"void",
]
@@ -3404,7 +3427,7 @@ dependencies = [
"log",
"multistream-select",
"once_cell",
- "rand 0.8.4",
+ "rand 0.8.5",
"smallvec 1.6.1",
"tokio",
"void",
@@ -3415,11 +3438,11 @@ name = "libp2p-swarm-derive"
version = "0.33.0"
source = "git+https://github.com/KomodoPlatform/rust-libp2p.git?tag=k-0.52.12#8bcc1fda79d56a2f398df3d45a29729b8ce0148d"
dependencies = [
- "heck",
+ "heck 0.4.0",
"proc-macro-warning",
"proc-macro2",
- "quote 1.0.33",
- "syn 2.0.38",
+ "quote 1.0.37",
+ "syn 2.0.77",
]
[[package]]
@@ -3497,7 +3520,7 @@ dependencies = [
"libsecp256k1-core",
"libsecp256k1-gen-ecmult",
"libsecp256k1-gen-genmult",
- "rand 0.8.4",
+ "rand 0.8.5",
"serde",
"sha2 0.9.9",
"typenum",
@@ -3791,8 +3814,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df"
dependencies = [
"proc-macro2",
- "quote 1.0.33",
- "syn 2.0.38",
+ "quote 1.0.37",
+ "syn 2.0.77",
]
[[package]]
@@ -3852,7 +3875,7 @@ dependencies = [
[[package]]
name = "mm2_bin_lib"
-version = "2.4.0-beta"
+version = "2.5.0-beta"
dependencies = [
"chrono",
"common",
@@ -3890,6 +3913,7 @@ dependencies = [
"libp2p",
"mm2_err_handle",
"mm2_event_stream",
+ "mm2_io",
"mm2_metrics",
"mm2_rpc",
"primitives",
@@ -4038,7 +4062,7 @@ dependencies = [
"async-trait",
"bitcrypto",
"blake2",
- "bytes 0.4.12",
+ "bytes",
"cfg-if 1.0.0",
"chain",
"chrono",
@@ -4070,6 +4094,7 @@ dependencies = [
"instant",
"itertools",
"js-sys",
+ "kdf_walletconnect",
"keys",
"lazy_static",
"libc",
@@ -4118,6 +4143,7 @@ dependencies = [
"sp-runtime-interface",
"sp-trie",
"spv_validation",
+ "tempfile",
"testcontainers",
"timed-map",
"tokio",
@@ -4185,7 +4211,7 @@ dependencies = [
"async-stream",
"async-trait",
"base64 0.21.7",
- "bytes 1.4.0",
+ "bytes",
"cfg-if 1.0.0",
"common",
"derive_more",
@@ -4194,7 +4220,7 @@ dependencies = [
"futures-util",
"gstuff",
"http 0.2.12",
- "http-body 0.4.5",
+ "http-body",
"httparse",
"hyper",
"js-sys",
@@ -4264,7 +4290,6 @@ dependencies = [
"serde_json",
"sha2 0.10.7",
"smallvec 1.6.1",
- "syn 2.0.38",
"timed-map",
"tokio",
"void",
@@ -4303,7 +4328,7 @@ dependencies = [
name = "mm2_test_helpers"
version = "0.1.0"
dependencies = [
- "bytes 1.4.0",
+ "bytes",
"cfg-if 1.0.0",
"chrono",
"common",
@@ -4344,7 +4369,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3048ef3680533a27f9f8e7d6a0bce44dc61e4895ea0f42709337fa1c8616fefe"
dependencies = [
"proc-macro2",
- "quote 1.0.33",
+ "quote 1.0.37",
"syn 1.0.95",
]
@@ -4399,7 +4424,7 @@ name = "multistream-select"
version = "0.13.0"
source = "git+https://github.com/KomodoPlatform/rust-libp2p.git?tag=k-0.52.12#8bcc1fda79d56a2f398df3d45a29729b8ce0148d"
dependencies = [
- "bytes 1.4.0",
+ "bytes",
"futures 0.3.28",
"log",
"pin-project",
@@ -4450,7 +4475,7 @@ version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86b33524dc0968bfad349684447bfce6db937a9ac3332a1fe60c0c5a5ce63f21"
dependencies = [
- "bytes 1.4.0",
+ "bytes",
"futures 0.3.28",
"log",
"netlink-packet-core",
@@ -4465,7 +4490,7 @@ version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411"
dependencies = [
- "bytes 1.4.0",
+ "bytes",
"futures 0.3.28",
"libc",
"log",
@@ -4530,8 +4555,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
dependencies = [
"proc-macro2",
- "quote 1.0.33",
- "syn 2.0.38",
+ "quote 1.0.37",
+ "syn 2.0.77",
]
[[package]]
@@ -4612,16 +4637,6 @@ dependencies = [
"num-traits",
]
-[[package]]
-name = "packed_simd_2"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282"
-dependencies = [
- "cfg-if 1.0.0",
- "libm 0.1.4",
-]
-
[[package]]
name = "pairing"
version = "0.18.0"
@@ -4632,6 +4647,27 @@ dependencies = [
"group 0.8.0",
]
+[[package]]
+name = "pairing_api"
+version = "0.1.0"
+source = "git+https://github.com/komodoplatform/walletconnectrust?tag=k-0.1.3#e2fb03ac19186fd2372a0eef71897ef8a6ae9653"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "hex",
+ "lazy_static",
+ "paste",
+ "rand 0.8.5",
+ "regex",
+ "relay_client",
+ "relay_rpc",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "url",
+ "wc_common",
+]
+
[[package]]
name = "parity-scale-codec"
version = "3.1.2"
@@ -4654,7 +4690,7 @@ checksum = "c45ed1f39709f5a89338fab50e59816b2e8815f5bb58276e7ddf9afd495f73f8"
dependencies = [
"proc-macro-crate",
"proc-macro2",
- "quote 1.0.33",
+ "quote 1.0.37",
"syn 1.0.95",
]
@@ -4750,9 +4786,9 @@ dependencies = [
[[package]]
name = "paste"
-version = "1.0.7"
+version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
[[package]]
name = "peg"
@@ -4772,7 +4808,7 @@ checksum = "bdad6a1d9cf116a059582ce415d5f5566aabcd4008646779dab7fdc2a9a9d426"
dependencies = [
"peg-runtime",
"proc-macro2",
- "quote 1.0.33",
+ "quote 1.0.37",
]
[[package]]
@@ -4822,8 +4858,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c"
dependencies = [
"proc-macro2",
- "quote 1.0.33",
- "syn 2.0.38",
+ "quote 1.0.37",
+ "syn 2.0.77",
]
[[package]]
@@ -4860,12 +4896,6 @@ version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
-[[package]]
-name = "platforms"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630"
-
[[package]]
name = "polling"
version = "3.7.4"
@@ -4883,23 +4913,23 @@ dependencies = [
[[package]]
name = "poly1305"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fe800695325da85083cd23b56826fccb2e2dc29b218e7811a6f33bc93f414be"
+checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf"
dependencies = [
- "cpufeatures 0.1.4",
+ "cpufeatures",
"opaque-debug",
"universal-hash",
]
[[package]]
name = "polyval"
-version = "0.5.1"
+version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e597450cbf209787f0e6de80bf3795c6b2356a380ee87837b545aded8dbc1823"
+checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25"
dependencies = [
"cfg-if 1.0.0",
- "cpufeatures 0.1.4",
+ "cpufeatures",
"opaque-debug",
"universal-hash",
]
@@ -4923,7 +4953,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
dependencies = [
"proc-macro2",
- "syn 2.0.38",
+ "syn 2.0.77",
]
[[package]]
@@ -4967,15 +4997,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70550716265d1ec349c41f70dd4f964b4fd88394efe4405f0c1da679c4799a07"
dependencies = [
"proc-macro2",
- "quote 1.0.33",
- "syn 2.0.38",
+ "quote 1.0.37",
+ "syn 2.0.77",
]
[[package]]
name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
dependencies = [
"unicode-ident",
]
@@ -4987,7 +5017,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78c2f43e8969d51935d2a7284878ae053ba30034cd563f673cde37ba5205685e"
dependencies = [
"dtoa",
- "itoa 1.0.10",
+ "itoa",
"parking_lot",
"prometheus-client-derive-encode",
]
@@ -4999,7 +5029,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b6a5217beb0ad503ee7fa752d451c905113d70721b937126158f3106a48cc1"
dependencies = [
"proc-macro2",
- "quote 1.0.33",
+ "quote 1.0.37",
"syn 1.0.95",
]
@@ -5009,7 +5039,7 @@ version = "0.12.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29"
dependencies = [
- "bytes 1.4.0",
+ "bytes",
"prost-derive",
]
@@ -5019,8 +5049,8 @@ version = "0.12.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
dependencies = [
- "bytes 1.4.0",
- "heck",
+ "bytes",
+ "heck 0.5.0",
"itertools",
"log",
"multimap",
@@ -5030,7 +5060,7 @@ dependencies = [
"prost",
"prost-types",
"regex",
- "syn 2.0.38",
+ "syn 2.0.77",
"tempfile",
]
@@ -5043,8 +5073,8 @@ dependencies = [
"anyhow",
"itertools",
"proc-macro2",
- "quote 1.0.33",
- "syn 2.0.38",
+ "quote 1.0.37",
+ "syn 2.0.77",
]
[[package]]
@@ -5130,7 +5160,7 @@ version = "0.2.0"
source = "git+https://github.com/KomodoPlatform/rust-libp2p.git?tag=k-0.52.12#8bcc1fda79d56a2f398df3d45a29729b8ce0148d"
dependencies = [
"asynchronous-codec",
- "bytes 1.4.0",
+ "bytes",
"quick-protobuf",
"thiserror",
"unsigned-varint",
@@ -5155,9 +5185,9 @@ checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
[[package]]
name = "quote"
-version = "1.0.33"
+version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
dependencies = [
"proc-macro2",
]
@@ -5225,14 +5255,13 @@ dependencies = [
[[package]]
name = "rand"
-version = "0.8.4"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
dependencies = [
"libc",
"rand_chacha 0.3.1",
"rand_core 0.6.4",
- "rand_hc 0.3.1",
]
[[package]]
@@ -5316,15 +5345,6 @@ dependencies = [
"rand_core 0.5.1",
]
-[[package]]
-name = "rand_hc"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
-dependencies = [
- "rand_core 0.6.4",
-]
-
[[package]]
name = "rand_isaac"
version = "0.1.1"
@@ -5470,7 +5490,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c523ccaed8ac4b0288948849a350b37d3035827413c458b6a40ddb614bb4f72"
dependencies = [
"proc-macro2",
- "quote 1.0.33",
+ "quote 1.0.37",
"syn 1.0.95",
]
@@ -5491,6 +5511,61 @@ version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
+[[package]]
+name = "relay_client"
+version = "0.1.0"
+source = "git+https://github.com/komodoplatform/walletconnectrust?tag=k-0.1.3#e2fb03ac19186fd2372a0eef71897ef8a6ae9653"
+dependencies = [
+ "chrono",
+ "data-encoding",
+ "futures-util",
+ "getrandom 0.2.9",
+ "http 1.1.0",
+ "js-sys",
+ "pin-project",
+ "rand 0.8.5",
+ "relay_rpc",
+ "serde",
+ "serde_json",
+ "serde_qs",
+ "thiserror",
+ "tokio",
+ "tokio-tungstenite-wasm",
+ "tokio-util",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-bindgen-test",
+ "web-sys",
+]
+
+[[package]]
+name = "relay_rpc"
+version = "0.1.0"
+source = "git+https://github.com/komodoplatform/walletconnectrust?tag=k-0.1.3#e2fb03ac19186fd2372a0eef71897ef8a6ae9653"
+dependencies = [
+ "anyhow",
+ "bs58 0.4.0",
+ "chrono",
+ "data-encoding",
+ "derive_more",
+ "ed25519-dalek 2.1.1",
+ "getrandom 0.2.9",
+ "hex",
+ "jsonwebtoken",
+ "once_cell",
+ "paste",
+ "rand 0.8.5",
+ "regex",
+ "serde",
+ "serde-aux",
+ "serde_json",
+ "sha2 0.10.7",
+ "strum",
+ "thiserror",
+ "url",
+]
+
[[package]]
name = "reqwest"
version = "0.11.9"
@@ -5498,13 +5573,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87f242f1488a539a79bac6dbe7c8609ae43b7914b7736210f239a37cccb32525"
dependencies = [
"base64 0.13.0",
- "bytes 1.4.0",
+ "bytes",
"encoding_rs",
"futures-core",
"futures-util",
"h2",
"http 0.2.12",
- "http-body 0.4.5",
+ "http-body",
"hyper",
"hyper-rustls 0.23.0",
"ipnet",
@@ -5604,7 +5679,7 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec"
dependencies = [
- "bytes 1.4.0",
+ "bytes",
"rustc-hex",
]
@@ -5913,7 +5988,7 @@ checksum = "50e334bb10a245e28e5fd755cabcafd96cfcd167c99ae63a46924ca8d8703a3c"
dependencies = [
"proc-macro-crate",
"proc-macro2",
- "quote 1.0.33",
+ "quote 1.0.37",
"syn 1.0.95",
]
@@ -6097,20 +6172,30 @@ name = "ser_error_derive"
version = "0.1.0"
dependencies = [
"proc-macro2",
- "quote 1.0.33",
+ "quote 1.0.37",
"ser_error",
"syn 1.0.95",
]
[[package]]
name = "serde"
-version = "1.0.189"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
dependencies = [
"serde_derive",
]
+[[package]]
+name = "serde-aux"
+version = "4.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d2e8bfba469d06512e11e3311d4d051a4a387a5b42d010404fecf3200321c95"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
[[package]]
name = "serde-wasm-bindgen"
version = "0.4.3"
@@ -6133,27 +6218,39 @@ dependencies = [
[[package]]
name = "serde_derive"
-version = "1.0.189"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
dependencies = [
"proc-macro2",
- "quote 1.0.33",
- "syn 2.0.38",
+ "quote 1.0.37",
+ "syn 2.0.77",
]
[[package]]
name = "serde_json"
-version = "1.0.79"
+version = "1.0.125"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95"
+checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed"
dependencies = [
- "indexmap 1.9.3",
- "itoa 1.0.10",
+ "indexmap 2.2.3",
+ "itoa",
+ "memchr",
"ryu",
"serde",
]
+[[package]]
+name = "serde_qs"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cac3f1e2ca2fe333923a1ae72caca910b98ed0630bb35ef6f8c8517d6e81afa"
+dependencies = [
+ "percent-encoding",
+ "serde",
+ "thiserror",
+]
+
[[package]]
name = "serde_repr"
version = "0.1.6"
@@ -6161,7 +6258,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76"
dependencies = [
"proc-macro2",
- "quote 1.0.33",
+ "quote 1.0.37",
"syn 1.0.95",
]
@@ -6181,7 +6278,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
dependencies = [
"form_urlencoded",
- "itoa 1.0.10",
+ "itoa",
"ryu",
"serde",
]
@@ -6204,7 +6301,7 @@ checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
dependencies = [
"darling",
"proc-macro2",
- "quote 1.0.33",
+ "quote 1.0.37",
"syn 1.0.95",
]
@@ -6235,7 +6332,7 @@ checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"
dependencies = [
"block-buffer 0.9.0",
"cfg-if 1.0.0",
- "cpufeatures 0.2.11",
+ "cpufeatures",
"digest 0.9.0",
"opaque-debug",
]
@@ -6247,7 +6344,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
dependencies = [
"cfg-if 1.0.0",
- "cpufeatures 0.2.11",
+ "cpufeatures",
"digest 0.10.7",
]
@@ -6259,7 +6356,7 @@ checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
dependencies = [
"block-buffer 0.9.0",
"cfg-if 1.0.0",
- "cpufeatures 0.2.11",
+ "cpufeatures",
"digest 0.9.0",
"opaque-debug",
]
@@ -6271,7 +6368,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
dependencies = [
"cfg-if 1.0.0",
- "cpufeatures 0.2.11",
+ "cpufeatures",
"digest 0.10.7",
]
@@ -6313,7 +6410,7 @@ dependencies = [
"blake2b_simd",
"chrono",
"derive_more",
- "ed25519-dalek",
+ "ed25519-dalek 1.0.1",
"hex",
"nom",
"reqwest",
@@ -6335,9 +6432,9 @@ dependencies = [
[[package]]
name = "signature"
-version = "1.4.0"
+version = "1.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788"
+checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
[[package]]
name = "signature"
@@ -6349,6 +6446,18 @@ dependencies = [
"rand_core 0.6.4",
]
+[[package]]
+name = "simple_asn1"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085"
+dependencies = [
+ "num-bigint",
+ "num-traits",
+ "thiserror",
+ "time 0.3.20",
+]
+
[[package]]
name = "siphasher"
version = "0.1.3"
@@ -6408,16 +6517,16 @@ dependencies = [
[[package]]
name = "snow"
-version = "0.9.2"
+version = "0.9.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ccba027ba85743e09d15c03296797cad56395089b832b48b5a5217880f57733"
+checksum = "850948bee068e713b8ab860fe1adc4d109676ab4c3b621fd8147f06b261f2f85"
dependencies = [
"aes-gcm",
"blake2",
"chacha20poly1305",
- "curve25519-dalek 4.0.0-rc.1",
+ "curve25519-dalek 4.1.3",
"rand_core 0.6.4",
- "ring 0.16.20",
+ "ring 0.17.3",
"rustc_version 0.4.0",
"sha2 0.10.7",
"subtle",
@@ -6461,11 +6570,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "083624472e8817d44d02c0e55df043737ff11f279af924abdf93845717c2b75c"
dependencies = [
"base64 0.13.0",
- "bytes 1.4.0",
+ "bytes",
"futures 0.3.28",
"httparse",
"log",
- "rand 0.8.4",
+ "rand 0.8.5",
"sha-1",
]
@@ -6501,7 +6610,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d676664972e22a0796176e81e7bec41df461d1edf52090955cdab55f2c956ff2"
dependencies = [
"proc-macro2",
- "quote 1.0.33",
+ "quote 1.0.37",
"syn 1.0.95",
]
@@ -6531,7 +6640,7 @@ dependencies = [
"Inflector",
"proc-macro-crate",
"proc-macro2",
- "quote 1.0.33",
+ "quote 1.0.37",
"syn 1.0.95",
]
@@ -6652,7 +6761,7 @@ checksum = "2f9799e6d412271cb2414597581128b03f3285f260ea49f5363d07df6a332b3e"
dependencies = [
"Inflector",
"proc-macro2",
- "quote 1.0.33",
+ "quote 1.0.37",
"serde",
"serde_json",
"unicode-xid 0.2.0",
@@ -6670,6 +6779,28 @@ version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+[[package]]
+name = "strum"
+version = "0.26.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
+dependencies = [
+ "strum_macros",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote 1.0.37",
+ "rustversion",
+ "syn 2.0.77",
+]
+
[[package]]
name = "subtle"
version = "2.4.0"
@@ -6709,18 +6840,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942"
dependencies = [
"proc-macro2",
- "quote 1.0.33",
+ "quote 1.0.37",
"unicode-ident",
]
[[package]]
name = "syn"
-version = "2.0.38"
+version = "2.0.77"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
dependencies = [
"proc-macro2",
- "quote 1.0.33",
+ "quote 1.0.37",
"unicode-ident",
]
@@ -6746,7 +6877,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
dependencies = [
"proc-macro2",
- "quote 1.0.33",
+ "quote 1.0.37",
"syn 1.0.95",
"unicode-xid 0.2.0",
]
@@ -6797,7 +6928,7 @@ version = "0.35.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43f8a10105d0a7c4af0a242e23ed5a12519afe5cc0e68419da441bb5981a6802"
dependencies = [
- "bytes 1.4.0",
+ "bytes",
"digest 0.10.7",
"ed25519 2.2.3",
"ed25519-consensus",
@@ -6842,7 +6973,7 @@ version = "0.35.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff525d5540a9fc535c38dc0d92a98da3ee36fcdfbda99cecb9f3cce5cd4d41d7"
dependencies = [
- "bytes 1.4.0",
+ "bytes",
"flex-error",
"num-derive",
"num-traits",
@@ -6861,12 +6992,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d8fe61b1772cd50038bdeeadf53773bb37a09e639dd8e6d996668fd220ddb29"
dependencies = [
"async-trait",
- "bytes 1.4.0",
+ "bytes",
"flex-error",
"getrandom 0.2.9",
"peg",
"pin-project",
- "rand 0.8.4",
+ "rand 0.8.5",
"semver 1.0.6",
"serde",
"serde_bytes",
@@ -6910,7 +7041,7 @@ dependencies = [
"hex",
"hmac 0.12.1",
"log",
- "rand 0.8.4",
+ "rand 0.8.5",
"serde",
"serde_json",
"sha2 0.10.7",
@@ -6932,8 +7063,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
"proc-macro2",
- "quote 1.0.33",
- "syn 2.0.38",
+ "quote 1.0.37",
+ "syn 2.0.77",
]
[[package]]
@@ -6952,7 +7083,7 @@ version = "0.3.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
dependencies = [
- "itoa 1.0.10",
+ "itoa",
"js-sys",
"serde",
"time-core",
@@ -6976,11 +7107,12 @@ dependencies = [
[[package]]
name = "timed-map"
-version = "1.3.0"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30565aee368a9b233f397f46cd803c59285b61d54c5b3ae378611bd467beecbe"
+checksum = "6f664a6b916d03d3e32c312c3b6ce31c24697c0f7ea6d87e20eb6372053ddf29"
dependencies = [
"rustc-hash",
+ "serde",
"web-time",
]
@@ -7024,7 +7156,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
dependencies = [
"autocfg 1.1.0",
- "bytes 1.4.0",
+ "bytes",
"libc",
"mio",
"num_cpus",
@@ -7035,16 +7167,6 @@ dependencies = [
"windows-sys 0.48.0",
]
-[[package]]
-name = "tokio-buf"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46"
-dependencies = [
- "bytes 0.4.12",
- "futures 0.1.29",
-]
-
[[package]]
name = "tokio-io-timeout"
version = "1.2.0"
@@ -7062,8 +7184,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
"proc-macro2",
- "quote 1.0.33",
- "syn 2.0.38",
+ "quote 1.0.37",
+ "syn 2.0.77",
]
[[package]]
@@ -7117,7 +7239,7 @@ dependencies = [
[[package]]
name = "tokio-tungstenite-wasm"
version = "0.1.1-alpha.0"
-source = "git+https://github.com/KomodoPlatform/tokio-tungstenite-wasm?rev=d20abdb#d20abdbbb2f03e302e3a8d11a1736ec8b50d0f58"
+source = "git+https://github.com/KomodoPlatform/tokio-tungstenite-wasm?rev=8fc7e2f#8fc7e2ff4c970bee0c0867399cb9a941881ea183"
dependencies = [
"futures-channel",
"futures-util",
@@ -7137,7 +7259,7 @@ version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f988a1a1adc2fb21f9c12aa96441da33a1728193ae0b95d2be22dbd17fcb4e5c"
dependencies = [
- "bytes 1.4.0",
+ "bytes",
"futures-core",
"futures-sink",
"pin-project-lite 0.2.9",
@@ -7198,11 +7320,11 @@ dependencies = [
"async-trait",
"axum",
"base64 0.21.7",
- "bytes 1.4.0",
+ "bytes",
"flate2",
"h2",
"http 0.2.12",
- "http-body 0.4.5",
+ "http-body",
"hyper",
"hyper-timeout",
"percent-encoding",
@@ -7229,8 +7351,8 @@ dependencies = [
"prettyplease",
"proc-macro2",
"prost-build",
- "quote 1.0.33",
- "syn 2.0.38",
+ "quote 1.0.37",
+ "syn 2.0.77",
]
[[package]]
@@ -7244,7 +7366,7 @@ dependencies = [
"indexmap 1.9.3",
"pin-project",
"pin-project-lite 0.2.9",
- "rand 0.8.4",
+ "rand 0.8.5",
"slab",
"tokio",
"tokio-util",
@@ -7284,8 +7406,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
dependencies = [
"proc-macro2",
- "quote 1.0.33",
- "syn 2.0.38",
+ "quote 1.0.37",
+ "syn 2.0.77",
]
[[package]]
@@ -7392,7 +7514,7 @@ dependencies = [
"idna 0.2.3",
"ipnet",
"lazy_static",
- "rand 0.8.4",
+ "rand 0.8.5",
"smallvec 1.6.1",
"socket2 0.4.9",
"thiserror",
@@ -7436,11 +7558,11 @@ checksum = "6ad3713a14ae247f22a728a0456a545df14acf3867f905adff84be99e23b3ad1"
dependencies = [
"base64 0.13.0",
"byteorder",
- "bytes 1.4.0",
+ "bytes",
"http 0.2.12",
"httparse",
"log",
- "rand 0.8.4",
+ "rand 0.8.5",
"rustls 0.20.4",
"sha-1",
"thiserror",
@@ -7451,9 +7573,9 @@ dependencies = [
[[package]]
name = "typenum"
-version = "1.15.0"
+version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
[[package]]
name = "uint"
@@ -7513,11 +7635,11 @@ checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
[[package]]
name = "universal-hash"
-version = "0.4.0"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402"
+checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
dependencies = [
- "generic-array",
+ "crypto-common",
"subtle",
]
@@ -7528,7 +7650,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836"
dependencies = [
"asynchronous-codec",
- "bytes 1.4.0",
+ "bytes",
]
[[package]]
@@ -7586,7 +7708,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
dependencies = [
"getrandom 0.2.9",
- "rand 0.8.4",
+ "rand 0.8.5",
"serde",
]
@@ -7723,8 +7845,8 @@ dependencies = [
"log",
"once_cell",
"proc-macro2",
- "quote 1.0.33",
- "syn 2.0.38",
+ "quote 1.0.37",
+ "syn 2.0.77",
"wasm-bindgen-shared",
]
@@ -7746,7 +7868,7 @@ version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
dependencies = [
- "quote 1.0.33",
+ "quote 1.0.37",
"wasm-bindgen-macro-support",
]
@@ -7757,8 +7879,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2",
- "quote 1.0.33",
- "syn 2.0.38",
+ "quote 1.0.37",
+ "syn 2.0.77",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -7790,7 +7912,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c2e18093f11c19ca4e188c177fecc7c372304c311189f12c2f9bea5b7324ac7"
dependencies = [
"proc-macro2",
- "quote 1.0.33",
+ "quote 1.0.37",
+]
+
+[[package]]
+name = "wc_common"
+version = "0.1.0"
+source = "git+https://github.com/komodoplatform/walletconnectrust?tag=k-0.1.3#e2fb03ac19186fd2372a0eef71897ef8a6ae9653"
+dependencies = [
+ "base64 0.21.7",
+ "chacha20poly1305",
+ "thiserror",
]
[[package]]
@@ -7816,11 +7948,11 @@ dependencies = [
[[package]]
name = "web3"
version = "0.19.0"
-source = "git+https://github.com/KomodoPlatform/rust-web3?tag=v0.20.0#01de1d732e61c920cfb2fb1533db7d7110c8a457"
+source = "git+https://github.com/komodoplatform/rust-web3?tag=v0.20.0#01de1d732e61c920cfb2fb1533db7d7110c8a457"
dependencies = [
"arrayvec 0.7.1",
"base64 0.13.0",
- "bytes 1.4.0",
+ "bytes",
"derive_more",
"ethabi",
"ethereum-types",
@@ -7835,7 +7967,7 @@ dependencies = [
"log",
"parking_lot",
"pin-project",
- "rand 0.8.4",
+ "rand 0.8.5",
"reqwest",
"rlp",
"serde",
@@ -8263,6 +8395,18 @@ dependencies = [
"zeroize",
]
+[[package]]
+name = "x25519-dalek"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277"
+dependencies = [
+ "curve25519-dalek 4.1.3",
+ "rand_core 0.6.4",
+ "serde",
+ "zeroize",
+]
+
[[package]]
name = "yamux"
version = "0.12.1"
@@ -8274,7 +8418,7 @@ dependencies = [
"nohash-hasher",
"parking_lot",
"pin-project",
- "rand 0.8.4",
+ "rand 0.8.5",
"static_assertions",
]
@@ -8290,7 +8434,7 @@ dependencies = [
"nohash-hasher",
"parking_lot",
"pin-project",
- "rand 0.8.4",
+ "rand 0.8.5",
"static_assertions",
]
@@ -8312,7 +8456,7 @@ checksum = "0f9079049688da5871a7558ddacb7f04958862c703e68258594cb7a862b5e33f"
[[package]]
name = "zcash_client_backend"
version = "0.5.0"
-source = "git+https://github.com/KomodoPlatform/librustzcash.git?tag=k-1.4.2#4e030a0f44cc17f100bf5f019563be25c5b8755f"
+source = "git+https://github.com/komodoplatform/librustzcash.git?tag=k-1.4.2#4e030a0f44cc17f100bf5f019563be25c5b8755f"
dependencies = [
"async-trait",
"base64 0.13.0",
@@ -8337,7 +8481,7 @@ dependencies = [
[[package]]
name = "zcash_client_sqlite"
version = "0.3.0"
-source = "git+https://github.com/KomodoPlatform/librustzcash.git?tag=k-1.4.2#4e030a0f44cc17f100bf5f019563be25c5b8755f"
+source = "git+https://github.com/komodoplatform/librustzcash.git?tag=k-1.4.2#4e030a0f44cc17f100bf5f019563be25c5b8755f"
dependencies = [
"async-trait",
"bech32",
@@ -8359,7 +8503,7 @@ dependencies = [
[[package]]
name = "zcash_extras"
version = "0.1.0"
-source = "git+https://github.com/KomodoPlatform/librustzcash.git?tag=k-1.4.2#4e030a0f44cc17f100bf5f019563be25c5b8755f"
+source = "git+https://github.com/komodoplatform/librustzcash.git?tag=k-1.4.2#4e030a0f44cc17f100bf5f019563be25c5b8755f"
dependencies = [
"async-trait",
"ff 0.8.0",
@@ -8375,7 +8519,7 @@ dependencies = [
[[package]]
name = "zcash_note_encryption"
version = "0.0.0"
-source = "git+https://github.com/KomodoPlatform/librustzcash.git?tag=k-1.4.2#4e030a0f44cc17f100bf5f019563be25c5b8755f"
+source = "git+https://github.com/komodoplatform/librustzcash.git?tag=k-1.4.2#4e030a0f44cc17f100bf5f019563be25c5b8755f"
dependencies = [
"blake2b_simd",
"byteorder",
@@ -8389,9 +8533,9 @@ dependencies = [
[[package]]
name = "zcash_primitives"
version = "0.5.0"
-source = "git+https://github.com/KomodoPlatform/librustzcash.git?tag=k-1.4.2#4e030a0f44cc17f100bf5f019563be25c5b8755f"
+source = "git+https://github.com/komodoplatform/librustzcash.git?tag=k-1.4.2#4e030a0f44cc17f100bf5f019563be25c5b8755f"
dependencies = [
- "aes 0.8.3",
+ "aes",
"bitvec 0.18.5",
"blake2b_simd",
"blake2s_simd",
@@ -8419,7 +8563,7 @@ dependencies = [
[[package]]
name = "zcash_proofs"
version = "0.5.0"
-source = "git+https://github.com/KomodoPlatform/librustzcash.git?tag=k-1.4.2#4e030a0f44cc17f100bf5f019563be25c5b8755f"
+source = "git+https://github.com/komodoplatform/librustzcash.git?tag=k-1.4.2#4e030a0f44cc17f100bf5f019563be25c5b8755f"
dependencies = [
"bellman",
"blake2b_simd",
@@ -8450,7 +8594,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17"
dependencies = [
"proc-macro2",
- "quote 1.0.33",
+ "quote 1.0.37",
"syn 1.0.95",
"synstructure",
]
diff --git a/Cargo.toml b/Cargo.toml
index 507c2e5c31..dd317f0d87 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,4 +1,6 @@
[workspace]
+# https://doc.rust-lang.org/beta/cargo/reference/features.html#feature-resolver-version-2
+resolver = "2"
members = [
"mm2src/coins_activation",
"mm2src/coins",
@@ -10,6 +12,7 @@ members = [
"mm2src/derives/ser_error_derive",
"mm2src/derives/ser_error",
"mm2src/hw_common",
+ "mm2src/kdf_walletconnect",
"mm2src/mm2_bin_lib",
"mm2src/mm2_bitcoin/chain",
"mm2src/mm2_bitcoin/crypto",
@@ -47,8 +50,187 @@ exclude = [
"mm2src/mm2_test_helpers",
]
-# https://doc.rust-lang.org/beta/cargo/reference/features.html#feature-resolver-version-2
-resolver = "2"
+[workspace.dependencies]
+aes = "0.8.3"
+argon2 = { version = "0.5.2", features = ["zeroize"] }
+arrayref = "0.3"
+anyhow = "1.0.89"
+async-std = "1.5"
+async-trait = "0.1.52"
+async-stream = "0.3"
+backtrace = "0.3"
+base64 = "0.21.2"
+bech32 = "0.9.1"
+bs58 = "0.4.0"
+bigdecimal = { version = "0.3", features = ["serde"] }
+bip32 = { version = "0.2.2", default-features = false, features = ["alloc", "secp256k1-ffi"] }
+bip39 = { version = "2.0.0", features = ["rand_core", "zeroize"], default-features = false }
+bitcoin = "0.29"
+bitcoin_hashes = "0.11"
+blake2 = "0.10.6"
+blake2b_simd = "0.5.10"
+bytes = "1.1"
+byteorder = "1.3"
+cbc = "0.1.2"
+cc = "1.0"
+cipher = "0.4.4"
+chrono = "0.4.23"
+cfg-if = "1.0"
+clap = { version = "4.2", features = ["derive"] }
+cosmrs = { version = "0.16", default-features = false }
+crossbeam = "0.8"
+crossbeam-channel = "0.5.1"
+compatible-time = { version = "1.1.0", package = "web-time" }
+crc32fast = { version = "1.3.2", features = ["std", "nightly"] }
+derive_more = "0.99"
+directories = "5.0"
+dirs = "1"
+ed25519-dalek = { version = "1.0.1", features = ["serde"] }
+either = "1.6"
+enum-primitive-derive = "0.2"
+env_logger = "0.9.3"
+ethabi = "17.0.0"
+ethcore-transaction = { git = "https://github.com/KomodoPlatform/mm2-parity-ethereum.git", rev = "mm2-v2.1.1" }
+ethereum-types = { version = "0.13", default-features = false, features = ["std", "serialize"] }
+ethkey = { git = "https://github.com/KomodoPlatform/mm2-parity-ethereum.git", rev = "mm2-v2.1.1" }
+# Waiting for https://github.com/rust-lang/rust/issues/54725 to use on Stable.
+#enum_dispatch = "0.1"
+ff = "0.8"
+findshlibs = "0.5"
+# using select macro requires the crate to be named futures, compilation failed with futures03 name
+futures = { version = "0.3.1", default-features = false }
+futures01 = { version = "0.1", package = "futures" }
+futures-rustls = { version = "0.24", default-features = false }
+futures-ticker = "0.0.3"
+futures-timer = "3.0"
+futures-util = { version = "0.3", default-features = false, features = ["sink", "std"] }
+fnv = "1.0.6"
+group = "0.8.0"
+gstuff = { version = "0.7", features = ["nightly"] }
+hash256-std-hasher = "0.15.2"
+hash-db = "0.15.2"
+hex = "0.4.2"
+hmac = "0.12.1"
+hkdf = "0.12.4"
+http = "0.2"
+http-body = "0.4"
+httparse = "1.8.0"
+hyper = "0.14.26"
+hyper-rustls = { version = "0.24", default-features = false }
+indexmap = "1.7.0"
+inquire = "0.6"
+itertools = "0.10"
+jemallocator = "0.5.0"
+jubjub = "0.5.1"
+js-sys = "0.3.27"
+# Same version as `web3` depends on.
+jsonrpc-core = "18.0.0"
+lazy_static = "1.4"
+libc = "0.2"
+libp2p = { git = "https://github.com/KomodoPlatform/rust-libp2p.git", tag = "k-0.52.12", default-features = false }
+lightning = "0.0.113"
+lightning-background-processor = "0.0.113"
+lightning-invoice = { version = "0.21.0", features = ["serde"] }
+lightning-net-tokio = "0.0.113"
+instant = "0.1.12"
+log = "0.4"
+metrics = "0.21"
+metrics-exporter-prometheus = "0.12.1"
+metrics-util = "0.15"
+mocktopus = "0.8.0"
+nom = "6.1.2"
+num-bigint = { version = "0.4", features = ["serde", "std"] }
+num-rational = { version = "0.4", features = ["serde"] }
+parity-util-mem = "0.11"
+num-traits = "0.2"
+pairing_api = { git = "https://github.com/komodoplatform/walletconnectrust", tag = "k-0.1.3" }
+parking_lot = { version = "0.12.0", default-features = false }
+parking_lot_core = { version = "0.6", features = ["nightly"] }
+passwords = "3.1"
+paste = "1.0"
+pin-project = "1.1.2"
+primitive-types = "0.11.1"
+prost = "0.12"
+prost-build = { version = "0.12", default-features = false }
+protobuf = "2.20"
+proc-macro2 = "1.0"
+quote = "1.0"
+regex = "1"
+relay_client = { git = "https://github.com/komodoplatform/walletconnectrust", tag = "k-0.1.3" }
+relay_rpc = { git = "https://github.com/komodoplatform/walletconnectrust", tag = "k-0.1.3" }
+reqwest = { version = "0.11.9", default-features = false, features = ["json"] }
+rand = { version = "0.7", default-features = false, features = ["std", "small_rng", "wasm-bindgen"] }
+rcgen = "0.10"
+ripemd160 = "0.9.0"
+rlp = "0.5"
+rmp-serde = "0.14.3"
+rusb = { version = "0.7.0", features = ["vendored"] }
+rustc-hash = "2.0"
+rustc-hex = "2"
+rust-ini = "0.13"
+rustls = { version = "0.21", default-features = false }
+rustls-pemfile = "1.0.2"
+rusqlite = { version = "0.28", features = ["bundled"] }
+secp256k1 = "0.20"
+secp256k1v24 = { version = "0.24", package = "secp256k1" }
+serde = { version = "1", default-features = false }
+serde_bytes = "0.11.5"
+serde_derive = { version = "1", default-features = false }
+serde_json = { version = "1", features = ["preserve_order", "raw_value"] }
+serde_with = "1.14.0"
+serde_repr = "0.1.6"
+serde-wasm-bindgen = "0.4.3"
+sha-1 = "0.9"
+sha2 = "0.10"
+sha3 = "0.9"
+sia-rust = { git = "https://github.com/KomodoPlatform/sia-rust", rev = "9f188b80b3213bcb604e7619275251ce08fae808" }
+siphasher = "0.1.1"
+smallvec = "1.6.1"
+sp-runtime-interface = { version = "6.0.0", default-features = false, features = ["disable_target_static_assertions"] }
+sp-trie = { version = "6.0", default-features = false }
+sql-builder = "3.1.1"
+syn = "1.0"
+sysinfo = "0.28"
+tempfile = "3.4.0"
+# using the same version as cosmrs
+tendermint-rpc = { version = "0.35", default-features = false }
+testcontainers = "0.15.0"
+tiny-bip39 = "0.8.0"
+thiserror = "1.0.40"
+time = "0.3.20"
+timed-map = { version = "1.4", features = ["rustc-hash", "serde", "wasm"] }
+tokio = { version = "1.20", default-features = false }
+tokio-rustls = { version = "0.24", default-features = false }
+tokio-tungstenite-wasm = { git = "https://github.com/KomodoPlatform/tokio-tungstenite-wasm", rev = "8fc7e2f", defautl-features = false, features = ["rustls-tls-native-roots"]}
+tonic = { version = "0.10", default-features = false }
+tonic-build = { version = "0.10", default-features = false, features = ["prost"] }
+tower-service = "0.3"
+trie-db = { version = "0.23.1", default-features = false }
+trie-root = "0.16.0"
+url = { version = "2.2.2", features = ["serde"] }
+uint = "0.9.3"
+uuid = { version = "1.2.2", features = ["fast-rng", "serde", "v4"] }
+void = "1.0"
+wagyu-zcash-parameters = { version = "0.2" }
+wasm-bindgen = "0.2.86"
+wasm-bindgen-futures = "0.4.21"
+wasm-bindgen-test = "0.3.2"
+wc_common = { git = "https://github.com/komodoplatform/walletconnectrust", tag = "k-0.1.3" }
+webpki-roots = "0.25"
+web-sys = {version = "0.3.55", default-features = false }
+# we don't need the default web3 features at all since we added our own web3 transport using shared httparse.workspace = true instance.
+# one of web3 dependencies is the old `tokio-uds 0.1.7` which fails cross-compiling to arm.
+# we don't need the default web3 features at all since we added our own web3 transport using shared hyper instance.
+web3 = { git = "https://github.com/komodoplatform/rust-web3", tag = "v0.20.0", default-features = false }
+winapi = "0.3"
+zbase32 = "0.1.2"
+zcash_client_backend = { git = "https://github.com/komodoplatform/librustzcash.git", tag = "k-1.4.2" }
+zcash_client_sqlite = { git = "https://github.com/KomodoPlatform/librustzcash.git", tag = "k-1.4.2" }
+zcash_extras = { git = "https://github.com/komodoplatform/librustzcash.git", tag = "k-1.4.2" }
+zcash_primitives = { git = "https://github.com/komodoplatform/librustzcash.git", tag = "k-1.4.2", features = ["transparent-inputs"] }
+zcash_proofs = { git = "https://github.com/KomodoPlatform/librustzcash.git", tag = "k-1.4.2", default-features = false }
+x25519-dalek = { version = "2.0", features = ["static_secrets"] }
+zeroize = { version = "1.5", features = ["zeroize_derive"] }
[profile.release]
debug = 0
diff --git a/README.md b/README.md
index 441c23ba8c..6b67fc4086 100755
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-
+
@@ -37,6 +37,7 @@
+ 
@@ -48,13 +49,13 @@
## What is the Komodo DeFi Framework?
-The Komodo DeFi Framework is open-source [atomic-swap](https://komodoplatform.com/en/academy/atomic-swaps/) software for seamless, decentralized, peer to peer trading between almost every blockchain asset in existence. This software works with propagation of orderbooks and swap states through the [libp2p](https://libp2p.io/) protocol and uses [Hash Time Lock Contracts (HTLCs)](https://en.bitcoinwiki.org/wiki/Hashed_Timelock_Contracts) for ensuring that the two parties in a swap either mutually complete a trade, or funds return to thier original owner.
+The Komodo DeFi Framework is open-source [atomic-swap](https://komodoplatform.com/en/docs/komodo-defi-framework/tutorials/#technical-comparisons) software for seamless, decentralized, peer to peer trading between almost every blockchain asset in existence. This software works with propagation of orderbooks and swap states through the [libp2p](https://libp2p.io/) protocol and uses [Hash Time Lock Contracts (HTLCs)](https://en.bitcoinwiki.org/wiki/Hashed_Timelock_Contracts) for ensuring that the two parties in a swap either mutually complete a trade, or funds return to thier original owner.
There is no 3rd party intermediary, no proxy tokens, and at all times users remain in sole possession of their private keys.
-A [well documented API](https://developers.komodoplatform.com/basic-docs/atomicdex/introduction-to-atomicdex.html) offers simple access to the underlying services using simple language agnostic JSON structured methods and parameters such that users can communicate with the core in a variety of methods such as [curl](https://developers.komodoplatform.com/basic-docs/atomicdex-api-legacy/buy.html) in CLI, or fully functioning [desktop and mobile applications](https://atomicdex.io/) like [Komodo Wallet Desktop](https://github.com/KomodoPlatform/komodo-wallet-desktop).
+A [well documented API](https://komodoplatform.com/en/docs/komodo-defi-framework/tutorials/) offers simple access to the underlying services using simple language agnostic JSON structured methods and parameters such that users can communicate with the core in a variety of methods such as [curl](https://komodoplatform.com/en/docs/komodo-defi-framework/api/legacy/buy/) in CLI, or fully functioning [browser, desktop and mobile wallet apps](https://komodoplatform.com/en/downloads/) like [Komodo Wallet](https://github.com/KomodoPlatform/komodo-wallet).
-For a curated list of Komodo DeFi Framework based projects and resources, check out [Awesome AtomicDEX](https://github.com/KomodoPlatform/awesome-atomicdex).
+For a curated list of Komodo DeFi Framework based projects and resources, check out [Awesome KomoDeFi]( https://github.com/KomodoPlatform/awesome-komodefi).
## Features
@@ -62,13 +63,13 @@ For a curated list of Komodo DeFi Framework based projects and resources, check
- Perform blockchain transactions without a local native chain (e.g. via Electrum servers)
- Query orderbooks for all pairs within the [supported coins](https://github.com/KomodoPlatform/coins/blob/master/coins)
- Buy/sell from the orderbook, or create maker orders
-- Configure automated ["makerbot" trading](https://developers.komodoplatform.com/basic-docs/atomicdex-api-20/start_simple_market_maker_bot.html) with periodic price updates and optional [telegram](https://telegram.org/) alerts
+- Configure automated ["makerbot" trading](https://komodoplatform.com/en/docs/komodo-defi-framework/api/v20/swaps_and_orders/start_simple_market_maker_bot/) with periodic price updates and optional [telegram](https://telegram.org/) alerts
## Building from source
### On Host System:
-[Pre-built release binaries](https://developers.komodoplatform.com/basic-docs/atomicdex/atomicdex-setup/get-started-atomicdex.html) are available for OSX, Linux or Windows.
+[Pre-built release binaries](https://github.com/KomodoPlatform/komodo-defi-framework/releases) are available for Android, iOS, OSX, Linux, Windows and WASM.
If you want to build from source, the following prerequisites are required:
- [Rustup](https://rustup.rs/)
@@ -80,7 +81,7 @@ If you want to build from source, the following prerequisites are required:
To build, run `cargo build` (or `cargo build -vv` to get verbose build output).
-For more detailed instructions, please refer to the [Installation Guide](https://developers.komodoplatform.com/basic-docs/atomicdex/atomicdex-setup/get-started-atomicdex.html).
+For more detailed instructions, please refer to the [Installation Guide](https://komodoplatform.com/en/docs/komodo-defi-framework/setup/).
### From Container:
@@ -100,6 +101,8 @@ docker run -v "$(pwd)":/app -w /app kdf-build-container cargo build
Just like building it on your host system, you will now have the target directory containing the build files.
+Alternatively, container images are available on [DockerHub](https://hub.docker.com/r/komodoofficial/komodo-defi-framework)
+
## Building WASM binary
Please refer to the [WASM Build Guide](./docs/WASM_BUILD.md).
@@ -108,7 +111,7 @@ Please refer to the [WASM Build Guide](./docs/WASM_BUILD.md).
Basic config is contained in two files, `MM2.json` and `coins`
-The user configuration [MM2.json file](https://developers.komodoplatform.com/basic-docs/atomicdex/atomicdex-setup/configure-mm2-json.html) contains rpc credentials, your mnemonic seed phrase, a `netid` (8762 is the current main network) and some extra [optional parameters](https://developers.komodoplatform.com/basic-docs/atomicdex/atomicdex-setup/get-started-atomicdex.html).
+The user configuration `MM2.json` file contains rpc credentials, your mnemonic seed phrase, a `netid` (8762 is the current main network) and some extra [optional parameters](https://komodoplatform.com/en/docs/komodo-defi-framework/setup/configure-mm2-json/).
For example:
```json
@@ -116,7 +119,8 @@ For example:
"gui": "core_readme",
"netid": 8762,
"rpc_password": "Ent3r_Un1Qu3_Pa$$w0rd",
- "passphrase": "ENTER_UNIQUE_SEED_PHRASE_DONT_USE_THIS_CHANGE_IT_OR_FUNDS_NOT_SAFU"
+ "passphrase": "ENTER_UNIQUE_SEED_PHRASE_DONT_USE_THIS_CHANGE_IT_OR_FUNDS_NOT_SAFU",
+ "seednodes": ["example-seed-address1.com", "example-seed-address2.com", "example-seed-address3.com", "example-seed-address4.com"]
}
```
@@ -167,7 +171,7 @@ curl --url "http://127.0.0.1:7783" --data '{
}'
```
-Refer to the [Komodo Developer Docs](https://developers.komodoplatform.com/basic-docs/atomicdex/introduction-to-atomicdex.html) for details of additional RPC methods and parameters
+Refer to the [Komodo Developer Docs](https://komodoplatform.com/en/docs/komodo-defi-framework/api/) for details of additional RPC methods and parameters
## Project structure
@@ -180,7 +184,7 @@ Refer to the [Komodo Developer Docs](https://developers.komodoplatform.com/basic
- [Contribution guide](./docs/CONTRIBUTING.md)
- [Setting up the environment to run the full tests suite](./docs/DEV_ENVIRONMENT.md)
- [Git flow and general workflow](./docs/GIT_FLOW_AND_WORKING_PROCESS.md)
-- [Komodo Developer Docs](https://developers.komodoplatform.com/basic-docs/atomicdex/introduction-to-atomicdex.html)
+- [Komodo Developer Docs](https://komodoplatform.com/en/docs/komodo-defi-framework/)
## Disclaimer
@@ -193,5 +197,5 @@ The current state can be considered as an alpha version.
## Help and troubleshooting
-If you have any question/want to report a bug/suggest an improvement feel free to [open an issue](https://github.com/KomodoPlatform/komodo-defi-framework/issues/new/choose) or join the [Komodo Platform Discord](https://discord.gg/PGxVm2y) `dev-marketmaker` channel.
+If you have any question/want to report a bug/suggest an improvement feel free to [open an issue](https://github.com/KomodoPlatform/komodo-defi-framework/issues/new/choose) or join the [Komodo Platform Discord](https://discord.gg/PGxVm2y) `dev-general` channel.
diff --git a/docs/DEV_ENVIRONMENT.md b/docs/DEV_ENVIRONMENT.md
index 5e4f6d1659..8782769079 100644
--- a/docs/DEV_ENVIRONMENT.md
+++ b/docs/DEV_ENVIRONMENT.md
@@ -66,16 +66,34 @@
CC=/opt/homebrew/opt/llvm/bin/clang AR=/opt/homebrew/opt/llvm/bin/llvm-ar wasm-pack test --firefox --headless mm2src/mm2_main
```
Please note `CC` and `AR` must be specified in the same line as `wasm-pack test mm2src/mm2_main`.
-#### Running specific WASM tests with Cargo
- - Install `wasm-bindgen-cli`:
- Make sure you have wasm-bindgen-cli installed with a version that matches the one specified in your Cargo.toml file.
- You can install it using Cargo with the following command:
- ```
- cargo install -f wasm-bindgen-cli --version
- ```
- - Run
- ```
- cargo test --target wasm32-unknown-unknown --package coins --lib utxo::utxo_block_header_storage::wasm::indexeddb_block_header_storage
- ```
+
+#### Running specific WASM tests
+
+There are two primary methods for running specific tests:
+
+* **Method 1: Using `wasm-pack` (Recommended for browser-based tests)**
+
+ To filter tests, append `--` to the `wasm-pack test` command, followed by the name of the test you want to run. This will execute only the tests whose names contain the provided string.
+
+ General Example:
+ ```shell
+ wasm-pack test --firefox --headless mm2src/mm2_main --
+ ```
+
+ > **Note for macOS users:** You must prepend the `CC` and `AR` environment variables to the command if they weren't already exported, just as you would when running all tests. For example: `CC=... AR=... wasm-pack test ...`
+
+* **Method 2: Using `cargo test` (For non-browser tests)**
+
+ This method uses the standard Cargo test runner with a wasm target and is useful for tests that do not require a browser environment.
+
+ a. **Install `wasm-bindgen-cli`**: Make sure you have `wasm-bindgen-cli` installed with a version that matches the one specified in your `Cargo.toml` file.
+ ```shell
+ cargo install -f wasm-bindgen-cli --version
+ ```
+
+ b. **Run the test**: Append `--` to the `cargo test` command, followed by the test path.
+ ```shell
+ cargo test --target wasm32-unknown-unknown --package coins --lib -- utxo::utxo_block_header_storage::wasm::indexeddb_block_header_storage
+ ```
PS If you notice that this guide is outdated, please submit a PR.
diff --git a/mm2src/adex_cli/Cargo.lock b/mm2src/adex_cli/Cargo.lock
index 5d5eb5abeb..099a669565 100644
--- a/mm2src/adex_cli/Cargo.lock
+++ b/mm2src/adex_cli/Cargo.lock
@@ -336,12 +336,6 @@ dependencies = [
"rustc-demangle",
]
-[[package]]
-name = "base58"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6107fe1be6682a68940da878d9e9f5e90ca5745b3dec9fd1bb393c8777d4f581"
-
[[package]]
name = "base64"
version = "0.21.7"
@@ -1714,7 +1708,6 @@ dependencies = [
name = "keys"
version = "0.1.0"
dependencies = [
- "base58",
"bech32",
"bitcrypto",
"derive_more",
diff --git a/mm2src/adex_cli/Cargo.toml b/mm2src/adex_cli/Cargo.toml
index cb477cacb0..cc05303755 100644
--- a/mm2src/adex_cli/Cargo.toml
+++ b/mm2src/adex_cli/Cargo.toml
@@ -7,33 +7,34 @@ description = "Provides a CLI interface and facilitates interoperating to komodo
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-anyhow = { version = "1.0", features = ["std"] }
-async-trait = "0.1"
-clap = { version = "4.2", features = ["derive"] }
+anyhow = { workspace = true, features = ["std"] }
+async-trait.workspace = true
+clap.workspace = true
common = { path = "../common" }
-derive_more = "0.99"
-directories = "5.0"
-env_logger = "0.9.3"
-http = "0.2"
-hyper = { version = "0.14.26", features = ["client", "http2", "tcp"] }
-hyper-rustls = "0.24"
-gstuff = { version = "0.7" , features = [ "nightly" ]}
-inquire = "0.6"
-itertools = "0.10"
-log = "0.4.21"
+derive_more.workspace = true
+directories.workspace = true
+env_logger.workspace = true
+http.workspace = true
+hyper = { workspace = true, features = ["client", "http2", "tcp"] }
+hyper-rustls.workspace = true
+stuff.workspace = true
+inquire.workspace = true
+itertools.workspace = true
+log.workspace = true
mm2_net = { path = "../mm2_net" }
mm2_number = { path = "../mm2_number" }
mm2_rpc = { path = "../mm2_rpc"}
mm2_core = { path = "../mm2_core" }
-passwords = "3.1"
+passwords.workspace = true
rpc = { path = "../mm2_bitcoin/rpc" }
-rustls = { version = "0.21", features = [ "dangerous_configuration" ] }
-serde = "1.0"
-serde_json = { version = "1", features = ["preserve_order", "raw_value"] }
-sysinfo = "0.28"
-tiny-bip39 = "0.8.0"
-tokio = { version = "1.20.0", features = [ "macros" ] }
-uuid = { version = "1.2.2", features = ["fast-rng", "serde", "v4"] }
+rustls = { workspace = true, features = [ "dangerous_configuration" ] }
+serde.workspace = true
+serde_json = { workspace = true, features = ["preserve_order", "raw_value"] }
+sysinfo.workspace = true
+tiny-bip39.workspace = true
+tokio = { workspace = true, features = [ "macros" ] }
+uuid.workspace = true
[target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3.3", features = ["processthreadsapi", "winnt"] }
+winapi = { workspace = true, features = ["processthreadsapi", "winnt"] }
+
diff --git a/mm2src/coins/Cargo.toml b/mm2src/coins/Cargo.toml
index 13aa9c2b72..3e49769c7e 100644
--- a/mm2src/coins/Cargo.toml
+++ b/mm2src/coins/Cargo.toml
@@ -13,60 +13,62 @@ enable-sia = [
default = []
run-docker-tests = []
for-tests = ["dep:mocktopus"]
-new-db-arch = []
+new-db-arch = ["mm2_core/new-db-arch"]
+
+# Temporary feature for implementing IBC wrap/unwrap mechanism and will be removed
+# once we consider it as stable.
+ibc-routing-for-swaps = []
[lib]
path = "lp_coins.rs"
doctest = false
[dependencies]
-async-std = { version = "1.5", features = ["unstable"] }
-async-trait = "0.1.52"
-base64 = "0.21.2"
-base58 = "0.2.0"
-bip32 = { version = "0.2.2", default-features = false, features = ["alloc", "secp256k1-ffi"] }
-bitcoin_hashes = "0.11"
+async-std = { workspace = true, features = ["unstable"] }
+async-trait.workspace = true
+base64.workspace = true
+bip32.workspace = true
+bitcoin_hashes.workspace = true
bitcrypto = { path = "../mm2_bitcoin/crypto" }
-blake2b_simd = { version = "0.5.10", optional = true }
-byteorder = "1.3"
-bytes = "0.4"
-cfg-if = "1.0"
+blake2b_simd = { workspace = true, optional = true }
+bs58.workspace = true
+byteorder.workspace = true
+bytes.workspace = true
+cfg-if.workspace = true
chain = { path = "../mm2_bitcoin/chain" }
-chrono = { version = "0.4.23", "features" = ["serde"] }
+chrono = { workspace = true, "features" = ["serde"] }
common = { path = "../common" }
-compatible-time = { version = "1.1.0", package = "web-time" }
-cosmrs = { version = "0.16", default-features = false }
-crossbeam = "0.8"
+compatible-time.workspace = true
+cosmrs.workspace = true
+crossbeam.workspace = true
crypto = { path = "../crypto" }
db_common = { path = "../db_common" }
-derive_more = "0.99"
-ed25519-dalek = { version = "1.0.1", features = ["serde"] }
+derive_more.workspace = true
+ed25519-dalek.workspace = true
enum_derives = { path = "../derives/enum_derives" }
-ethabi = { version = "17.0.0" }
-ethcore-transaction = { git = "https://github.com/KomodoPlatform/mm2-parity-ethereum.git", rev = "mm2-v2.1.1" }
-ethereum-types = { version = "0.13", default-features = false, features = ["std", "serialize"] }
-ethkey = { git = "https://github.com/KomodoPlatform/mm2-parity-ethereum.git", rev = "mm2-v2.1.1" }
-# Waiting for https://github.com/rust-lang/rust/issues/54725 to use on Stable.
-#enum_dispatch = "0.1"
-futures01 = { version = "0.1", package = "futures" }
-futures-util = { version = "0.3", default-features = false, features = ["sink", "std"] }
-futures-ticker = "0.0.3"
-# using select macro requires the crate to be named futures, compilation failed with futures03 name
-futures = { version = "0.3", package = "futures", features = ["compat", "async-await"] }
-group = "0.8.0"
-gstuff = { version = "0.7", features = ["nightly"] }
-hex = "0.4.2"
-http = "0.2"
-itertools = { version = "0.10", features = ["use_std"] }
-jsonrpc-core = "18.0.0"
+kdf_walletconnect = { path = "../kdf_walletconnect" }
+ethabi.workspace = true
+ethcore-transaction.workspace = true
+ethereum-types.workspace = true
+ethkey.workspace = true
+futures01.workspace = true
+futures-util.workspace = true
+futures-ticker.workspace = true
+futures = { workspace = true, features = ["compat", "async-await"] }
+group.workspace = true
+gstuff.workspace = true
+hex.workspace = true
+http.workspace = true
+itertools = { workspace = true, features = ["use_std"] }
+jsonrpc-core.workspace = true
+jubjub.workspace = true
keys = { path = "../mm2_bitcoin/keys" }
-lazy_static = "1.4"
-libc = "0.2"
-nom = "6.1.2"
+lazy_static.workspace = true
+libc.workspace = true
+nom.workspace = true
mm2_core = { path = "../mm2_core" }
mm2_err_handle = { path = "../mm2_err_handle" }
mm2_event_stream = { path = "../mm2_event_stream" }
-mm2_git = { path = "../mm2_git" }
mm2_io = { path = "../mm2_io" }
mm2_metrics = { path = "../mm2_metrics" }
mm2_net = { path = "../mm2_net" }
@@ -74,100 +76,101 @@ mm2_number = { path = "../mm2_number"}
mm2_p2p = { path = "../mm2_p2p", default-features = false }
mm2_rpc = { path = "../mm2_rpc" }
mm2_state_machine = { path = "../mm2_state_machine" }
-mocktopus = { version = "0.8.0", optional = true }
-num-traits = "0.2"
-parking_lot = { version = "0.12.0", features = ["nightly"] }
+mocktopus = { workspace = true, optional = true }
+num-traits.workspace = true
+parking_lot = { workspace = true, features = ["nightly"] }
primitives = { path = "../mm2_bitcoin/primitives" }
-prost = "0.12"
-protobuf = "2.20"
+prost.workspace = true
+protobuf.workspace = true
proxy_signature = { path = "../proxy_signature" }
-rand = { version = "0.7", features = ["std", "small_rng"] }
-regex = "1"
-reqwest = { version = "0.11.9", default-features = false, features = ["json"], optional = true }
-rlp = { version = "0.5" }
-rmp-serde = "0.14.3"
+rand = { workspace = true, features = ["std", "small_rng"] }
+regex.workspace = true
+reqwest = { workspace = true, optional = true }
+rlp.workspace = true
+rmp-serde.workspace = true
rpc = { path = "../mm2_bitcoin/rpc" }
rpc_task = { path = "../rpc_task" }
script = { path = "../mm2_bitcoin/script" }
-secp256k1 = { version = "0.20" }
+secp256k1.workspace = true
ser_error = { path = "../derives/ser_error" }
ser_error_derive = { path = "../derives/ser_error_derive" }
-serde = "1.0"
-serde_derive = "1.0"
-serde_json = { version = "1", features = ["preserve_order", "raw_value"] }
-serde_with = "1.14.0"
+serde.workspace = true
+serde_derive.workspace = true
+serde_json = { workspace = true, features = ["preserve_order", "raw_value"] }
+serde_with.workspace = true
serialization = { path = "../mm2_bitcoin/serialization" }
serialization_derive = { path = "../mm2_bitcoin/serialization_derive" }
sia-rust = { git = "https://github.com/KomodoPlatform/sia-rust", rev = "9f188b80b3213bcb604e7619275251ce08fae808", optional = true }
spv_validation = { path = "../mm2_bitcoin/spv_validation" }
-sha2 = "0.10"
-sha3 = "0.9"
+sha2.workspace = true
+sha3.workspace = true
utxo_signer = { path = "utxo_signer" }
# using the same version as cosmrs
-tendermint-rpc = { version = "0.35", default-features = false }
-tokio-tungstenite-wasm = { git = "https://github.com/KomodoPlatform/tokio-tungstenite-wasm", rev = "d20abdb", features = ["rustls-tls-native-roots"]}
-url = { version = "2.2.2", features = ["serde"] }
-uuid = { version = "1.2.2", features = ["fast-rng", "serde", "v4"] }
+tendermint-rpc.workspace = true
+tokio-tungstenite-wasm = { workspace = true, features = ["rustls-tls-native-roots"]}
+url.workspace = true
+uuid.workspace = true
# One of web3 dependencies is the old `tokio-uds 0.1.7` which fails cross-compiling to ARM.
# We don't need the default web3 features at all since we added our own web3 transport using shared HYPER instance.
-web3 = { git = "https://github.com/KomodoPlatform/rust-web3", tag = "v0.20.0", default-features = false }
-zbase32 = "0.1.2"
-zcash_client_backend = { git = "https://github.com/KomodoPlatform/librustzcash.git", tag = "k-1.4.2" }
-zcash_extras = { git = "https://github.com/KomodoPlatform/librustzcash.git", tag = "k-1.4.2" }
-zcash_primitives = {features = ["transparent-inputs"], git = "https://github.com/KomodoPlatform/librustzcash.git", tag = "k-1.4.2" }
+web3 = { workspace = true, default-features = false }
+zbase32.workspace = true
+zcash_client_backend.workspace = true
+zcash_extras.workspace = true
+zcash_primitives.workspace = true
[target.'cfg(target_arch = "wasm32")'.dependencies]
-blake2b_simd = "0.5"
-ff = "0.8"
-futures-util = "0.3"
-jubjub = "0.5.1"
-js-sys = { version = "0.3.27" }
+blake2b_simd.workspace = true
+ff.workspace = true
+futures-util.workspace = true
+jubjub.workspace = true
+js-sys.workspace = true
mm2_db = { path = "../mm2_db" }
mm2_metamask = { path = "../mm2_metamask" }
mm2_test_helpers = { path = "../mm2_test_helpers" }
-time = { version = "0.3.20", features = ["wasm-bindgen"] }
-timed-map = { version = "1.3", features = ["rustc-hash", "wasm"] }
-tonic = { version = "0.10", default-features = false, features = ["prost", "codegen", "gzip"] }
-tower-service = "0.3"
-wasm-bindgen = "0.2.86"
-wasm-bindgen-futures = { version = "0.4.1" }
-wasm-bindgen-test = { version = "0.3.2" }
-web-sys = { version = "0.3.55", features = ["console", "Headers", "Request", "RequestInit", "RequestMode", "Response", "Window"] }
-zcash_proofs = { git = "https://github.com/KomodoPlatform/librustzcash.git", tag = "k-1.4.2", default-features = false, features = ["local-prover"] }
+time = { workspace = true, features = ["wasm-bindgen"] }
+timed-map = { workspace = true, features = ["rustc-hash", "wasm"] }
+tonic = { workspace = true, default-features = false, features = ["prost", "codegen", "gzip"] }
+tower-service.workspace = true
+wasm-bindgen.workspace = true
+wasm-bindgen-futures.workspace = true
+wasm-bindgen-test.workspace = true
+web-sys = { workspace = true, features = ["console", "Headers", "Request", "RequestInit", "RequestMode", "Response", "Window"] }
+zcash_proofs = { workspace = true, features = ["local-prover"] }
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-dirs = { version = "1" }
-bitcoin = "0.29"
-hyper = { version = "0.14.26", features = ["client", "http2", "server", "tcp"] }
-# using webpki-tokio to avoid rejecting valid certificates
-# got "invalid certificate: UnknownIssuer" for https://ropsten.infura.io on iOS using default-features
-hyper-rustls = { version = "0.24", default-features = false, features = ["http1", "http2", "webpki-tokio"] }
-lightning = "0.0.113"
-lightning-background-processor = "0.0.113"
-lightning-invoice = { version = "0.21.0", features = ["serde"] }
-lightning-net-tokio = "0.0.113"
-rust-ini = { version = "0.13" }
-rustls = { version = "0.21", features = ["dangerous_configuration"] }
-secp256k1v24 = { version = "0.24", package = "secp256k1" }
-timed-map = { version = "1.3", features = ["rustc-hash"] }
-tokio = { version = "1.20" }
-tokio-rustls = { version = "0.24" }
-tonic = { version = "0.10", features = ["tls", "tls-webpki-roots", "gzip"] }
-webpki-roots = { version = "0.25" }
-zcash_client_sqlite = { git = "https://github.com/KomodoPlatform/librustzcash.git", tag = "k-1.4.2" }
-zcash_proofs = { git = "https://github.com/KomodoPlatform/librustzcash.git", tag = "k-1.4.2", default-features = false, features = ["local-prover", "multicore"] }
+dirs.workspace = true
+bitcoin.workspace = true
+hyper = { workspace = true, features = ["client", "http2", "server", "tcp"] }
+hyper-rustls = { workspace = true, default-features = false, features = ["http1", "http2", "webpki-tokio"] }
+lightning.workspace = true
+lightning-background-processor.workspace = true
+lightning-invoice.workspace = true
+lightning-net-tokio.workspace = true
+rust-ini.workspace = true
+rustls = { workspace = true, features = ["dangerous_configuration"] }
+secp256k1v24.workspace = true
+timed-map = { workspace = true, features = ["rustc-hash"] }
+tokio.workspace = true
+tokio-rustls.workspace = true
+tonic = { workspace = true, features = ["codegen", "prost", "gzip", "tls", "tls-webpki-roots"] }
+webpki-roots.workspace = true
+zcash_client_sqlite.workspace = true
+zcash_proofs = { workspace = true, features = ["local-prover", "multicore"] }
[target.'cfg(windows)'.dependencies]
-winapi = "0.3"
+winapi.workspace = true
[dev-dependencies]
mm2_test_helpers = { path = "../mm2_test_helpers" }
-mocktopus = { version = "0.8.0" }
+mocktopus.workspace = true
mm2_p2p = { path = "../mm2_p2p", features = ["application"] }
+ff.workspace = true
+jubjub.workspace = true
+reqwest.workspace = true
[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
-wagyu-zcash-parameters = { version = "0.2" }
+wagyu-zcash-parameters.workspace = true
[build-dependencies]
-prost-build = { version = "0.12", default-features = false }
-tonic-build = { version = "0.10", default-features = false, features = ["prost"] }
+prost-build.workspace = true
+tonic-build.workspace = true
diff --git a/mm2src/coins/coin_balance.rs b/mm2src/coins/coin_balance.rs
index 3ec047ee80..dbcf02c343 100644
--- a/mm2src/coins/coin_balance.rs
+++ b/mm2src/coins/coin_balance.rs
@@ -506,6 +506,27 @@ pub mod common_impl {
params.min_addresses_number.max(Some(path_to_address.address_id + 1)),
)
.await?;
+ drop(new_account);
+
+ if coin.is_trezor() {
+ let enabled_address =
+ hd_wallet
+ .get_enabled_address()
+ .await
+ .ok_or(EnableCoinBalanceError::NewAddressDerivingError(
+ NewAddressDerivingError::Internal(
+ "Couldn't find enabled address after it has already been enabled".to_string(),
+ ),
+ ))?;
+ coin.received_enabled_address_from_hw_wallet(enabled_address)
+ .await
+ .map_err(|e| {
+ EnableCoinBalanceError::NewAddressDerivingError(NewAddressDerivingError::Internal(format!(
+ "Coin rejected the enabled address derived from the hardware wallet: {}",
+ e
+ )))
+ })?;
+ }
// Todo: The enabled address should be indicated in the response.
result.accounts.push(account_balance);
return Ok(result);
@@ -538,6 +559,27 @@ pub mod common_impl {
.await?;
result.accounts.push(account_balance);
}
+ drop(accounts);
+
+ if coin.is_trezor() {
+ let enabled_address =
+ hd_wallet
+ .get_enabled_address()
+ .await
+ .ok_or(EnableCoinBalanceError::NewAddressDerivingError(
+ NewAddressDerivingError::Internal(
+ "Couldn't find enabled address after it has already been enabled".to_string(),
+ ),
+ ))?;
+ coin.received_enabled_address_from_hw_wallet(enabled_address)
+ .await
+ .map_err(|e| {
+ EnableCoinBalanceError::NewAddressDerivingError(NewAddressDerivingError::Internal(format!(
+ "Coin rejected the enabled address derived from the hardware wallet: {}",
+ e
+ )))
+ })?;
+ }
Ok(result)
}
diff --git a/mm2src/coins/coin_errors.rs b/mm2src/coins/coin_errors.rs
index 3e9bbc7349..86a2c0da00 100644
--- a/mm2src/coins/coin_errors.rs
+++ b/mm2src/coins/coin_errors.rs
@@ -108,3 +108,15 @@ pub enum MyAddressError {
UnexpectedDerivationMethod(String),
InternalError(String),
}
+
+impl std::error::Error for MyAddressError {
+ fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+ // This error doesn't wrap another error, so we return None
+ None
+ }
+}
+
+#[derive(Debug, Display)]
+pub enum AddressFromPubkeyError {
+ InternalError(String),
+}
diff --git a/mm2src/coins/coins_tests.rs b/mm2src/coins/coins_tests.rs
deleted file mode 100644
index bc7ab27897..0000000000
--- a/mm2src/coins/coins_tests.rs
+++ /dev/null
@@ -1,164 +0,0 @@
-use crate::update_coins_config;
-
-#[test]
-fn test_update_coin_config_success() {
- let conf = json!([
- {
- "coin": "RICK",
- "asset": "RICK",
- "fname": "RICK (TESTCOIN)",
- "rpcport": 25435,
- "txversion": 4,
- "overwintered": 1,
- "mm2": 1,
- },
- {
- "coin": "MORTY",
- "asset": "MORTY",
- "fname": "MORTY (TESTCOIN)",
- "rpcport": 16348,
- "txversion": 4,
- "overwintered": 1,
- "mm2": 1,
- },
- {
- "coin": "ETH",
- "name": "ethereum",
- "fname": "Ethereum",
- "etomic": "0x0000000000000000000000000000000000000000",
- "rpcport": 80,
- "mm2": 1,
- "required_confirmations": 3,
- },
- {
- "coin": "ARPA",
- "name": "arpa-chain",
- "fname": "ARPA Chain",
- // ARPA coin contains the protocol already. This coin should be skipped.
- "protocol": {
- "type":"ERC20",
- "protocol_data": {
- "platform": "ETH",
- "contract_address": "0xBA50933C268F567BDC86E1aC131BE072C6B0b71a"
- }
- },
- "rpcport": 80,
- "mm2": 1,
- "required_confirmations": 3,
- },
- {
- "coin": "JST",
- "name": "JST",
- "fname": "JST (TESTCOIN)",
- "etomic": "0x996a8ae0304680f6a69b8a9d7c6e37d65ab5ab56",
- "rpcport": 80,
- "mm2": 1,
- },
- ]);
- let actual = update_coins_config(conf).unwrap();
- let expected = json!([
- {
- "coin": "RICK",
- "asset": "RICK",
- "fname": "RICK (TESTCOIN)",
- "rpcport": 25435,
- "txversion": 4,
- "overwintered": 1,
- "mm2": 1,
- "protocol": {
- "type": "UTXO"
- },
- },
- {
- "coin": "MORTY",
- "asset": "MORTY",
- "fname": "MORTY (TESTCOIN)",
- "rpcport": 16348,
- "txversion": 4,
- "overwintered": 1,
- "mm2": 1,
- "protocol": {
- "type": "UTXO"
- },
- },
- {
- "coin": "ETH",
- "name": "ethereum",
- "fname": "Ethereum",
- "rpcport": 80,
- "mm2": 1,
- "required_confirmations": 3,
- "protocol": {
- "type": "ETH"
- },
- },
- {
- "coin": "ARPA",
- "name": "arpa-chain",
- "fname": "ARPA Chain",
- "protocol": {
- "type": "ERC20",
- "protocol_data": {
- "platform": "ETH",
- "contract_address": "0xBA50933C268F567BDC86E1aC131BE072C6B0b71a"
- }
- },
- "rpcport": 80,
- "mm2": 1,
- "required_confirmations": 3,
- },
- {
- "coin": "JST",
- "name": "JST",
- "fname": "JST (TESTCOIN)",
- "rpcport": 80,
- "mm2": 1,
- "protocol": {
- "type": "ERC20",
- "protocol_data": {
- "platform": "ETH",
- "contract_address": "0x996a8ae0304680f6a69b8a9d7c6e37d65ab5ab56"
- }
- },
- },
- ]);
- assert_eq!(actual, expected);
-}
-
-#[test]
-fn test_update_coin_config_error_not_array() {
- let conf = json!({
- "coin": "RICK",
- "asset": "RICK",
- "fname": "RICK (TESTCOIN)",
- "rpcport": 25435,
- "txversion": 4,
- "overwintered": 1,
- "mm2": 1,
- });
- let error = update_coins_config(conf).err().unwrap();
- assert!(error.contains("Coins config must be an array"));
-}
-
-#[test]
-fn test_update_coin_config_error_not_object() {
- let conf = json!([["Ford", "BMW", "Fiat"]]);
- let error = update_coins_config(conf).err().unwrap();
- assert!(error.contains("Expected object, found"));
-}
-
-#[test]
-fn test_update_coin_config_invalid_etomic() {
- let conf = json!([
- {
- "coin": "JST",
- "name": "JST",
- "fname": "JST (TESTCOIN)",
- "etomic": 12345678,
- "rpcport": 80,
- "mm2": 1,
- },
- ]);
- let error = update_coins_config(conf).err().unwrap();
- assert!(error.contains("Expected etomic as string, found"));
-}
diff --git a/mm2src/coins/eth.rs b/mm2src/coins/eth.rs
index 7a82841687..91c3294c2d 100644
--- a/mm2src/coins/eth.rs
+++ b/mm2src/coins/eth.rs
@@ -20,6 +20,7 @@
//
// Copyright © 2023 Pampex LTD and TillyHK LTD. All rights reserved.
//
+use self::wallet_connect::{send_transaction_with_walletconnect, WcEthTxParams};
use super::eth::Action::{Call, Create};
use super::watcher_common::{validate_watcher_reward, REWARD_GAS_AMOUNT};
use super::*;
@@ -58,6 +59,7 @@ use common::executor::{abortable_queue::AbortableQueue, AbortSettings, Abortable
Timer};
use common::log::{debug, error, info, warn};
use common::number_type_casting::SafeTypeCastingNumbers;
+use common::wait_until_sec;
use common::{now_sec, small_rng, DEX_FEE_ADDR_RAW_PUBKEY};
use crypto::privkey::key_pair_from_secret;
use crypto::{Bip44Chain, CryptoCtx, CryptoCtxError, GlobalHDAccountArc, KeyPairPolicy};
@@ -77,6 +79,7 @@ use futures::compat::Future01CompatExt;
use futures::future::{join, join_all, select_ok, try_join_all, Either, FutureExt, TryFutureExt};
use futures01::Future;
use http::Uri;
+use kdf_walletconnect::{WalletConnectCtx, WalletConnectOps};
use mm2_core::mm_ctx::{MmArc, MmWeak};
use mm2_number::bigdecimal_custom::CheckedDivision;
use mm2_number::{BigDecimal, BigUint, MmNumber};
@@ -100,9 +103,8 @@ use web3::types::{Action as TraceAction, BlockId, BlockNumber, Bytes, CallReques
use web3::{self, Web3};
cfg_wasm32! {
- use common::{now_ms, wait_until_ms};
use crypto::MetamaskArc;
- use ethereum_types::{H264, H520};
+ use ethereum_types::H520;
use mm2_metamask::MetamaskError;
use web3::types::TransactionRequest;
}
@@ -137,6 +139,7 @@ mod eth_rpc;
#[cfg(target_arch = "wasm32")] mod eth_wasm_tests;
#[cfg(any(test, target_arch = "wasm32"))] mod for_tests;
pub(crate) mod nft_swap_v2;
+pub mod wallet_connect;
mod web3_transport;
use web3_transport::{http_transport::HttpTransportNode, Web3Transport};
@@ -161,6 +164,8 @@ use erc20::get_token_decimals;
pub(crate) mod eth_swap_v2;
use eth_swap_v2::{extract_id_from_tx_data, EthPaymentType, PaymentMethod, SpendTxSearchParams};
+pub mod tron;
+
/// https://github.com/artemii235/etomic-swap/blob/master/contracts/EtomicSwap.sol
/// Dev chain (195.201.137.5:8565) contract address: 0x83965C539899cC0F918552e5A26915de40ee8852
/// Ropsten: https://ropsten.etherscan.io/address/0x7bc1bbdd6a0a722fc9bffc49c921b685ecb84b94
@@ -762,6 +767,30 @@ struct SavedErc20Events {
latest_block: U64,
}
+/// Specifies which blockchain the EthCoin operates on: EVM-compatible or TRON.
+/// This distinction allows unified logic for EVM & TRON coins.
+#[derive(Clone, Debug)]
+pub enum ChainSpec {
+ Evm { chain_id: u64 },
+ Tron { network: tron::Network },
+}
+
+impl ChainSpec {
+ pub fn chain_id(&self) -> Option {
+ match self {
+ ChainSpec::Evm { chain_id } => Some(*chain_id),
+ ChainSpec::Tron { .. } => None,
+ }
+ }
+
+ pub fn kind(&self) -> &'static str {
+ match self {
+ ChainSpec::Evm { .. } => "EVM",
+ ChainSpec::Tron { .. } => "TRON",
+ }
+ }
+}
+
#[derive(Clone, Debug, PartialEq, Eq)]
pub enum EthCoinType {
/// Ethereum itself or it's forks: ETC/others
@@ -784,6 +813,11 @@ pub enum EthPrivKeyBuildPolicy {
#[cfg(target_arch = "wasm32")]
Metamask(MetamaskArc),
Trezor,
+ WalletConnect {
+ address: Address,
+ public_key_uncompressed: H520,
+ session_topic: String,
+ },
}
impl EthPrivKeyBuildPolicy {
@@ -816,6 +850,8 @@ impl From for EthPrivKeyBuildPolicy {
pub struct EthCoinImpl {
ticker: String,
pub coin_type: EthCoinType,
+ /// Specifies the underlying blockchain (EVM or TRON).
+ pub chain_spec: ChainSpec,
pub(crate) priv_key_policy: EthPrivKeyPolicy,
/// Either an Iguana address or a 'EthHDWallet' instance.
/// Arc is used to use the same hd wallet from platform coin if we need to.
@@ -836,7 +872,6 @@ pub struct EthCoinImpl {
/// Coin needs access to the context in order to reuse the logging and shutdown facilities.
/// Using a weak reference by default in order to avoid circular references and leaks.
pub ctx: MmWeak,
- chain_id: u64,
/// The name of the coin with which Trezor wallet associates this asset.
trezor_coin: Option,
/// the block range used for eth_getLogs
@@ -913,7 +948,7 @@ macro_rules! tx_type_from_pay_for_gas_option {
impl EthCoinImpl {
#[cfg(not(target_arch = "wasm32"))]
fn eth_traces_path(&self, ctx: &MmArc, my_address: Address) -> PathBuf {
- ctx.dbdir()
+ ctx.address_dir(&my_address.display_address())
.join("TRANSACTIONS")
.join(format!("{}_{:#02x}_trace.json", self.ticker, my_address))
}
@@ -921,7 +956,8 @@ impl EthCoinImpl {
/// Load saved ETH traces from local DB
#[cfg(not(target_arch = "wasm32"))]
fn load_saved_traces(&self, ctx: &MmArc, my_address: Address) -> Option {
- let content = gstuff::slurp(&self.eth_traces_path(ctx, my_address));
+ let path = self.eth_traces_path(ctx, my_address);
+ let content = gstuff::slurp(&path);
if content.is_empty() {
None
} else {
@@ -943,9 +979,8 @@ impl EthCoinImpl {
#[cfg(not(target_arch = "wasm32"))]
fn store_eth_traces(&self, ctx: &MmArc, my_address: Address, traces: &SavedTraces) {
let content = json::to_vec(traces).unwrap();
- let tmp_file = format!("{}.tmp", self.eth_traces_path(ctx, my_address).display());
- std::fs::write(&tmp_file, content).unwrap();
- std::fs::rename(tmp_file, self.eth_traces_path(ctx, my_address)).unwrap();
+ let path = self.eth_traces_path(ctx, my_address);
+ mm2_io::fs::write(&path, &content, true).unwrap();
}
/// Store ETH traces to local DB
@@ -957,7 +992,7 @@ impl EthCoinImpl {
#[cfg(not(target_arch = "wasm32"))]
fn erc20_events_path(&self, ctx: &MmArc, my_address: Address) -> PathBuf {
- ctx.dbdir()
+ ctx.address_dir(&my_address.display_address())
.join("TRANSACTIONS")
.join(format!("{}_{:#02x}_events.json", self.ticker, my_address))
}
@@ -966,9 +1001,8 @@ impl EthCoinImpl {
#[cfg(not(target_arch = "wasm32"))]
fn store_erc20_events(&self, ctx: &MmArc, my_address: Address, events: &SavedErc20Events) {
let content = json::to_vec(events).unwrap();
- let tmp_file = format!("{}.tmp", self.erc20_events_path(ctx, my_address).display());
- std::fs::write(&tmp_file, content).unwrap();
- std::fs::rename(tmp_file, self.erc20_events_path(ctx, my_address)).unwrap();
+ let path = self.erc20_events_path(ctx, my_address);
+ mm2_io::fs::write(&path, &content, true).unwrap();
}
/// Store ERC20 events to local DB
@@ -981,7 +1015,8 @@ impl EthCoinImpl {
/// Load saved ERC20 events from local DB
#[cfg(not(target_arch = "wasm32"))]
fn load_saved_erc20_events(&self, ctx: &MmArc, my_address: Address) -> Option {
- let content = gstuff::slurp(&self.erc20_events_path(ctx, my_address));
+ let path = self.erc20_events_path(ctx, my_address);
+ let content = gstuff::slurp(&path);
if content.is_empty() {
None
} else {
@@ -1043,7 +1078,7 @@ impl EthCoinImpl {
}
#[inline(always)]
- pub fn chain_id(&self) -> u64 { self.chain_id }
+ pub fn chain_id(&self) -> Option { self.chain_spec.chain_id() }
}
async fn get_raw_transaction_impl(coin: EthCoin, req: RawTransactionRequest) -> RawTransactionResult {
@@ -1161,7 +1196,16 @@ pub async fn withdraw_erc1155(ctx: MmArc, withdraw_type: WithdrawErc1155) -> Wit
.build()
.map_to_mm(|e| WithdrawError::InternalError(e.to_string()))?;
let secret = eth_coin.priv_key_policy.activated_key_or_err()?.secret();
- let signed = tx.sign(secret, Some(eth_coin.chain_id))?;
+ let chain_id = match eth_coin.chain_spec {
+ ChainSpec::Evm { chain_id } => chain_id,
+ // Todo: Add support for Tron NFTs
+ ChainSpec::Tron { .. } => {
+ return MmError::err(WithdrawError::InternalError(
+ "Tron is not supported for withdraw_erc1155 yet".to_owned(),
+ ))
+ },
+ };
+ let signed = tx.sign(secret, Some(chain_id))?;
let signed_bytes = rlp::encode(&signed);
let fee_details = EthTxFeeDetails::new(gas, pay_for_gas_option, fee_coin)?;
@@ -1252,7 +1296,16 @@ pub async fn withdraw_erc721(ctx: MmArc, withdraw_type: WithdrawErc721) -> Withd
.build()
.map_to_mm(|e| WithdrawError::InternalError(e.to_string()))?;
let secret = eth_coin.priv_key_policy.activated_key_or_err()?.secret();
- let signed = tx.sign(secret, Some(eth_coin.chain_id))?;
+ let chain_id = match eth_coin.chain_spec {
+ ChainSpec::Evm { chain_id } => chain_id,
+ // Todo: Add support for Tron NFTs
+ ChainSpec::Tron { .. } => {
+ return MmError::err(WithdrawError::InternalError(
+ "Tron is not supported for withdraw_erc721 yet".to_owned(),
+ ))
+ },
+ };
+ let signed = tx.sign(secret, Some(chain_id))?;
let signed_bytes = rlp::encode(&signed);
let fee_details = EthTxFeeDetails::new(gas, pay_for_gas_option, fee_coin)?;
@@ -1527,7 +1580,7 @@ impl SwapOps for EthCoin {
activated_key: ref key_pair,
..
} => key_pair_from_secret(key_pair.secret().as_fixed_bytes()).expect("valid key"),
- EthPrivKeyPolicy::Trezor => todo!(),
+ EthPrivKeyPolicy::Trezor | EthPrivKeyPolicy::WalletConnect { .. } => todo!(),
#[cfg(target_arch = "wasm32")]
EthPrivKeyPolicy::Metamask(_) => todo!(),
}
@@ -1545,6 +1598,7 @@ impl SwapOps for EthCoin {
.public_slice()
.try_into()
.expect("valid key length!"),
+ EthPrivKeyPolicy::WalletConnect { public_key, .. } => public_key.into(),
EthPrivKeyPolicy::Trezor => todo!(),
#[cfg(target_arch = "wasm32")]
EthPrivKeyPolicy::Metamask(ref metamask_policy) => metamask_policy.public_key.0,
@@ -2284,6 +2338,11 @@ impl MarketCoinOps for EthCoin {
}
}
+ fn address_from_pubkey(&self, pubkey: &H264Json) -> MmResult {
+ let addr = addr_from_raw_pubkey(&pubkey.0).map_err(AddressFromPubkeyError::InternalError)?;
+ Ok(addr.display_address())
+ }
+
async fn get_public_key(&self) -> Result> {
match self.priv_key_policy {
EthPrivKeyPolicy::Iguana(ref key_pair)
@@ -2311,6 +2370,10 @@ impl MarketCoinOps for EthCoin {
EthPrivKeyPolicy::Metamask(ref metamask_policy) => {
Ok(format!("{:02x}", metamask_policy.public_key_uncompressed))
},
+ EthPrivKeyPolicy::WalletConnect {
+ public_key_uncompressed,
+ ..
+ } => Ok(format!("{public_key_uncompressed:02x}")),
}
}
@@ -2328,10 +2391,25 @@ impl MarketCoinOps for EthCoin {
Some(keccak256(&stream.out()).take())
}
- fn sign_message(&self, message: &str) -> SignatureResult {
+ fn sign_message(&self, message: &str, address: Option) -> SignatureResult {
let message_hash = self.sign_message_hash(message).ok_or(SignatureError::PrefixNotFound)?;
- let privkey = &self.priv_key_policy.activated_key_or_err()?.secret();
- let signature = sign(privkey, &H256::from(message_hash))?;
+
+ let secret = if let Some(address) = address {
+ let path_to_coin = self.priv_key_policy.path_to_coin_or_err()?;
+ let derivation_path = address
+ .valid_derivation_path(path_to_coin)
+ .mm_err(|err| SignatureError::InvalidRequest(err.to_string()))?;
+ let privkey = self
+ .priv_key_policy
+ .hd_wallet_derived_priv_key_or_err(&derivation_path)?;
+ ethkey::Secret::from_slice(privkey.as_slice()).ok_or(MmError::new(SignatureError::InternalError(
+ "failed to derive ethkey::Secret".to_string(),
+ )))?
+ } else {
+ self.priv_key_policy.activated_key_or_err()?.secret().clone()
+ };
+ let signature = sign(&secret, &H256::from(message_hash))?;
+
Ok(format!("0x{}", signature))
}
@@ -2578,6 +2656,7 @@ impl MarketCoinOps for EthCoin {
EthPrivKeyPolicy::Trezor => ERR!("'display_priv_key' is not supported for Hardware Wallets"),
#[cfg(target_arch = "wasm32")]
EthPrivKeyPolicy::Metamask(_) => ERR!("'display_priv_key' is not supported for MetaMask"),
+ EthPrivKeyPolicy::WalletConnect { .. } => ERR!("'display_priv_key' is not supported for WalletConnect"),
}
}
@@ -2635,15 +2714,23 @@ async fn sign_transaction_with_keypair<'a>(
if !coin.is_tx_type_supported(&tx_type) {
return Err(TransactionErr::Plain("Eth transaction type not supported".into()));
}
+
let tx_builder = UnSignedEthTxBuilder::new(tx_type, nonce, gas, action, value, data);
let tx_builder = tx_builder_with_pay_for_gas_option(coin, tx_builder, pay_for_gas_option)
.map_err(|e| TransactionErr::Plain(e.get_inner().to_string()))?;
let tx = tx_builder.build()?;
+ let chain_id = match coin.chain_spec {
+ ChainSpec::Evm { chain_id } => chain_id,
+ // Todo: Add Tron signing logic
+ ChainSpec::Tron { .. } => {
+ return Err(TransactionErr::Plain(
+ "Tron is not supported for sign_transaction_with_keypair yet".into(),
+ ))
+ },
+ };
+ let signed_tx = tx.sign(key_pair.secret(), Some(chain_id))?;
- Ok((
- tx.sign(key_pair.secret(), Some(coin.chain_id))?,
- web3_instances_with_latest_nonce,
- ))
+ Ok((signed_tx, web3_instances_with_latest_nonce))
}
/// Sign and send eth transaction with provided keypair,
@@ -2717,7 +2804,7 @@ async fn sign_and_send_transaction_with_metamask(
// It's important to return the transaction hex for the swap,
// so wait up to 60 seconds for the transaction to appear on the RPC node.
- let wait_rpc_timeout = 60_000;
+ let wait_rpc_timeout = 60;
let check_every = 1.;
// Please note that this method may take a long time
@@ -2784,13 +2871,70 @@ async fn sign_raw_eth_tx(coin: &EthCoin, args: &SignEthTransactionParams) -> Raw
})
.map_to_mm(|err| RawTransactionError::TransactionError(err.get_plain_text_format()))
},
+ EthPrivKeyPolicy::WalletConnect { .. } => {
+ // NOTE: doesn't work with wallets that doesn't support `eth_signTransaction`.
+ // e.g Metamask
+ let wc = {
+ let ctx = MmArc::from_weak(&coin.ctx).expect("No context");
+ WalletConnectCtx::from_ctx(&ctx)
+ .expect("TODO: handle error when enable kdf initialization without key.")
+ };
+ // Todo: Tron will have to be set with `ChainSpec::Evm` to work with walletconnect.
+ // This means setting the protocol as `ETH` in coin config and having a different coin for this mode.
+ let chain_id = coin.chain_spec.chain_id().ok_or(RawTransactionError::InvalidParam(
+ "WalletConnect needs chain_id to be set".to_owned(),
+ ))?;
+ let my_address = coin
+ .derivation_method
+ .single_addr_or_err()
+ .await
+ .mm_err(|e| RawTransactionError::InternalError(e.to_string()))?;
+ let address_lock = coin.get_address_lock(my_address.to_string()).await;
+ let _nonce_lock = address_lock.lock().await;
+ let pay_for_gas_option = if let Some(ref pay_for_gas) = args.pay_for_gas {
+ pay_for_gas.clone().try_into()?
+ } else {
+ // use legacy gas_price() if not set
+ info!(target: "sign-and-send", "get_gas_price…");
+ let gas_price = coin.get_gas_price().await?;
+ PayForGasOption::Legacy(LegacyGasPrice { gas_price })
+ };
+ let (nonce, _) = coin
+ .clone()
+ .get_addr_nonce(my_address)
+ .compat()
+ .await
+ .map_to_mm(RawTransactionError::InvalidParam)?;
+ let (max_fee_per_gas, max_priority_fee_per_gas) = pay_for_gas_option.get_fee_per_gas();
+
+ info!(target: "sign-and-send", "WalletConnect signing and sending tx…");
+ let (signed_tx, _) = coin
+ .wc_sign_tx(&wc, WcEthTxParams {
+ my_address,
+ gas_price: pay_for_gas_option.get_gas_price(),
+ action,
+ value,
+ gas: args.gas_limit,
+ data: &data,
+ nonce,
+ chain_id,
+ max_fee_per_gas,
+ max_priority_fee_per_gas,
+ })
+ .await
+ .mm_err(|err| RawTransactionError::TransactionError(err.to_string()))?;
+
+ Ok(RawTransactionRes {
+ tx_hex: signed_tx.tx_hex().into(),
+ })
+ },
+ EthPrivKeyPolicy::Trezor => MmError::err(RawTransactionError::InvalidParam(
+ "sign raw eth tx not implemented for Trezor".into(),
+ )),
#[cfg(target_arch = "wasm32")]
EthPrivKeyPolicy::Metamask(_) => MmError::err(RawTransactionError::InvalidParam(
"sign raw eth tx not implemented for Metamask".into(),
)),
- EthPrivKeyPolicy::Trezor => MmError::err(RawTransactionError::InvalidParam(
- "sign raw eth tx not implemented for Trezor".into(),
- )),
}
}
@@ -3733,8 +3877,23 @@ impl EthCoin {
.single_addr_or_err()
.await
.map_err(|e| TransactionErr::Plain(ERRL!("{}", e)))?;
+
sign_and_send_transaction_with_keypair(&coin, key_pair, address, value, action, data, gas).await
},
+ EthPrivKeyPolicy::WalletConnect { .. } => {
+ let wc = {
+ let ctx = MmArc::from_weak(&coin.ctx).expect("No context");
+ WalletConnectCtx::from_ctx(&ctx)
+ .expect("TODO: handle error when enable kdf initialization without key.")
+ };
+ let address = coin
+ .derivation_method
+ .single_addr_or_err()
+ .await
+ .map_err(|e| TransactionErr::Plain(ERRL!("{}", e)))?;
+
+ send_transaction_with_walletconnect(coin, &wc, address, value, action, &data, gas).await
+ },
EthPrivKeyPolicy::Trezor => Err(TransactionErr::Plain(ERRL!("Trezor is not supported for swaps yet!"))),
#[cfg(target_arch = "wasm32")]
EthPrivKeyPolicy::Metamask(_) => {
@@ -5368,15 +5527,14 @@ impl EthCoin {
}
/// Returns `None` if the transaction hasn't appeared on the RPC nodes at the specified time.
- #[cfg(target_arch = "wasm32")]
async fn wait_for_tx_appears_on_rpc(
&self,
tx_hash: H256,
- wait_rpc_timeout_ms: u64,
+ wait_rpc_timeout_s: u64,
check_every: f64,
) -> Web3RpcResult> {
- let wait_until = wait_until_ms(wait_rpc_timeout_ms);
- while now_ms() < wait_until {
+ let wait_until = wait_until_sec(wait_rpc_timeout_s);
+ while now_sec() < wait_until {
let maybe_tx = self.transaction(TransactionId::Hash(tx_hash)).await?;
if let Some(tx) = maybe_tx {
let signed_tx = signed_tx_from_web3_tx(tx).map_to_mm(Web3RpcError::InvalidResponse)?;
@@ -5386,10 +5544,10 @@ impl EthCoin {
Timer::sleep(check_every).await;
}
- let timeout_s = wait_rpc_timeout_ms / 1000;
warn!(
- "Couldn't fetch the '{tx_hash:02x}' transaction hex as it hasn't appeared on the RPC node in {timeout_s}s"
+ "Couldn't fetch the '{tx_hash:02x}' transaction hex as it hasn't appeared on the RPC node in {wait_rpc_timeout_s}s"
);
+
Ok(None)
}
@@ -6314,6 +6472,27 @@ pub async fn eth_coin_from_conf_and_request(
protocol: CoinProtocol,
priv_key_policy: PrivKeyBuildPolicy,
) -> Result {
+ fn get_chain_id_from_platform(ctx: &MmArc, ticker: &str, platform: &str) -> Result {
+ let platform_conf = coin_conf(ctx, platform);
+ if platform_conf.is_null() {
+ return ERR!(
+ "Failed to activate ERC20 token '{}': the platform '{}' is not defined in the coins config.",
+ ticker,
+ platform
+ );
+ }
+ let platform_protocol: CoinProtocol = json::from_value(platform_conf["protocol"].clone())
+ .map_err(|e| ERRL!("Error parsing platform protocol for '{}': {}", platform, e))?;
+ match platform_protocol {
+ CoinProtocol::ETH { chain_id } => Ok(chain_id),
+ protocol => ERR!(
+ "Failed to activate ERC20 token '{}': the platform protocol '{:?}' must be ETH",
+ ticker,
+ protocol
+ ),
+ }
+ }
+
// Convert `PrivKeyBuildPolicy` to `EthPrivKeyBuildPolicy` if it's possible.
let priv_key_policy = try_s!(EthPrivKeyBuildPolicy::try_from(priv_key_policy));
@@ -6402,8 +6581,8 @@ pub async fn eth_coin_from_conf_and_request(
return ERR!("Failed to get client version for all urls");
}
- let (coin_type, decimals) = match protocol {
- CoinProtocol::ETH => (EthCoinType::Eth, ETH_DECIMALS),
+ let (coin_type, decimals, chain_id) = match protocol {
+ CoinProtocol::ETH { chain_id } => (EthCoinType::Eth, ETH_DECIMALS, chain_id),
CoinProtocol::ERC20 {
platform,
contract_address,
@@ -6422,9 +6601,13 @@ pub async fn eth_coin_from_conf_and_request(
),
Some(d) => d as u8,
};
- (EthCoinType::Erc20 { platform, token_addr }, decimals)
+ let chain_id = get_chain_id_from_platform(ctx, ticker, &platform)?;
+ (EthCoinType::Erc20 { platform, token_addr }, decimals, chain_id)
+ },
+ CoinProtocol::NFT { platform } => {
+ let chain_id = get_chain_id_from_platform(ctx, ticker, &platform)?;
+ (EthCoinType::Nft { platform }, ETH_DECIMALS, chain_id)
},
- CoinProtocol::NFT { platform } => (EthCoinType::Nft { platform }, ETH_DECIMALS),
_ => return ERR!("Expect ETH, ERC20 or NFT protocol"),
};
@@ -6444,10 +6627,6 @@ pub async fn eth_coin_from_conf_and_request(
let sign_message_prefix: Option = json::from_value(conf["sign_message_prefix"].clone()).unwrap_or(None);
- let chain_id = try_s!(conf["chain_id"]
- .as_u64()
- .ok_or_else(|| format!("chain_id is not set for {}", ticker)));
-
let trezor_coin: Option = json::from_value(conf["trezor_coin"].clone()).unwrap_or(None);
let initial_history_state = if req["tx_history"].as_bool().unwrap_or(false) {
@@ -6480,6 +6659,8 @@ pub async fn eth_coin_from_conf_and_request(
priv_key_policy: key_pair,
derivation_method: Arc::new(derivation_method),
coin_type,
+ // Tron is not supported for v1 activation
+ chain_spec: ChainSpec::Evm { chain_id },
sign_message_prefix,
swap_contract_address,
swap_v2_contracts: None,
@@ -6493,7 +6674,6 @@ pub async fn eth_coin_from_conf_and_request(
max_eth_tx_type,
ctx: ctx.weak(),
required_confirmations,
- chain_id,
trezor_coin,
logs_block_range: conf["logs_block_range"].as_u64().unwrap_or(DEFAULT_LOGS_BLOCK_RANGE),
address_nonce_locks,
@@ -6782,6 +6962,8 @@ fn calc_total_fee(gas: U256, pay_for_gas_option: &PayForGasOption) -> NumConvers
}
}
+// Todo: Tron have a different concept from gas (Energy, Bandwidth and Free Transaction), it should be added as a different function
+// and this should be part of a trait abstracted over both types
#[allow(clippy::result_large_err)]
fn tx_builder_with_pay_for_gas_option(
eth_coin: &EthCoin,
@@ -6793,9 +6975,14 @@ fn tx_builder_with_pay_for_gas_option(
PayForGasOption::Eip1559(Eip1559FeePerGas {
max_priority_fee_per_gas,
max_fee_per_gas,
- }) => tx_builder
- .with_priority_fee_per_gas(max_fee_per_gas, max_priority_fee_per_gas)
- .with_chain_id(eth_coin.chain_id),
+ }) => {
+ let chain_id = eth_coin
+ .chain_id()
+ .ok_or_else(|| WithdrawError::InternalError("chain_id should be set for an EVM coin".to_string()))?;
+ tx_builder
+ .with_priority_fee_per_gas(max_fee_per_gas, max_priority_fee_per_gas)
+ .with_chain_id(chain_id)
+ },
};
Ok(tx_builder)
}
@@ -7279,6 +7466,15 @@ impl CommonSwapOpsV2 for EthCoin {
.expect("slice with incorrect length");
Public::from_slice(&pubkey_bytes)
},
+ EthPrivKeyPolicy::WalletConnect {
+ public_key_uncompressed,
+ ..
+ } => {
+ let pubkey_bytes: [u8; 64] = public_key_uncompressed[1..65]
+ .try_into()
+ .expect("slice with incorrect length");
+ Public::from_slice(&pubkey_bytes)
+ },
}
}
@@ -7299,6 +7495,7 @@ impl EthCoin {
let coin = EthCoinImpl {
ticker: self.ticker.clone(),
coin_type: new_coin_type,
+ chain_spec: self.chain_spec.clone(),
priv_key_policy: self.priv_key_policy.clone(),
derivation_method: Arc::clone(&self.derivation_method),
sign_message_prefix: self.sign_message_prefix.clone(),
@@ -7315,7 +7512,6 @@ impl EthCoin {
swap_txfee_policy: Mutex::new(self.swap_txfee_policy.lock().unwrap().clone()),
max_eth_tx_type: self.max_eth_tx_type,
ctx: self.ctx.clone(),
- chain_id: self.chain_id,
trezor_coin: self.trezor_coin.clone(),
logs_block_range: self.logs_block_range,
address_nonce_locks: Arc::clone(&self.address_nonce_locks),
diff --git a/mm2src/coins/eth/erc20.rs b/mm2src/coins/eth/erc20.rs
index 75f7033fda..3ab3d89a03 100644
--- a/mm2src/coins/eth/erc20.rs
+++ b/mm2src/coins/eth/erc20.rs
@@ -1,6 +1,6 @@
use crate::eth::web3_transport::Web3Transport;
use crate::eth::{EthCoin, ERC20_CONTRACT};
-use crate::{CoinsContext, MmCoinEnum};
+use crate::{CoinsContext, MarketCoinOps, MmCoinEnum};
use ethabi::Token;
use ethereum_types::Address;
use futures_util::TryFutureExt;
@@ -90,16 +90,20 @@ pub fn get_erc20_ticker_by_contract_address(ctx: &MmArc, platform: &str, contrac
})
}
-/// Finds an enabled ERC20 token by its contract address and returns it as `MmCoinEnum`.
-pub async fn get_enabled_erc20_by_contract(
+/// Finds an enabled ERC20 token by contract address and platform coin ticker and returns it as `MmCoinEnum`.
+pub async fn get_enabled_erc20_by_platform_and_contract(
ctx: &MmArc,
- contract_address: Address,
+ platform: &str,
+ contract_address: &Address,
) -> MmResult, String> {
let cctx = CoinsContext::from_ctx(ctx)?;
let coins = cctx.coins.lock().await;
Ok(coins.values().find_map(|coin| match &coin.inner {
- MmCoinEnum::EthCoin(eth_coin) if eth_coin.erc20_token_address() == Some(contract_address) => {
+ MmCoinEnum::EthCoin(eth_coin)
+ if eth_coin.platform_ticker() == platform
+ && eth_coin.erc20_token_address().as_ref() == Some(contract_address) =>
+ {
Some(coin.inner.clone())
},
_ => None,
diff --git a/mm2src/coins/eth/eth_balance_events.rs b/mm2src/coins/eth/eth_balance_events.rs
index 0cb7afe134..a991dab101 100644
--- a/mm2src/coins/eth/eth_balance_events.rs
+++ b/mm2src/coins/eth/eth_balance_events.rs
@@ -1,9 +1,10 @@
use super::EthCoin;
use crate::{eth::{u256_to_big_decimal, Erc20TokenDetails},
+ hd_wallet::AddrToString,
BalanceError, CoinWithDerivationMethod};
use common::{executor::Timer, log, Future01CompatExt};
use mm2_err_handle::prelude::MmError;
-use mm2_event_stream::{Broadcaster, Event, EventStreamer, NoDataIn, StreamHandlerInput};
+use mm2_event_stream::{Broadcaster, Event, EventStreamer, NoDataIn, StreamHandlerInput, StreamerId};
use mm2_number::BigDecimal;
use async_trait::async_trait;
@@ -111,7 +112,7 @@ async fn fetch_balance(
.await
.map_err(|error| BalanceFetchError {
ticker: token_ticker.clone(),
- address: address.to_string(),
+ address: address.addr_to_string(),
error,
})?,
coin.decimals,
@@ -122,7 +123,7 @@ async fn fetch_balance(
.await
.map_err(|error| BalanceFetchError {
ticker: token_ticker.clone(),
- address: address.to_string(),
+ address: address.addr_to_string(),
error,
})?,
info.decimals,
@@ -131,13 +132,13 @@ async fn fetch_balance(
let balance_as_big_decimal = u256_to_big_decimal(balance_as_u256, decimals).map_err(|e| BalanceFetchError {
ticker: token_ticker.clone(),
- address: address.to_string(),
+ address: address.addr_to_string(),
error: e.into(),
})?;
Ok(BalanceData {
ticker: token_ticker,
- address: address.to_string(),
+ address: address.addr_to_string(),
balance: balance_as_big_decimal,
})
}
@@ -146,7 +147,11 @@ async fn fetch_balance(
impl EventStreamer for EthBalanceEventStreamer {
type DataInType = NoDataIn;
- fn streamer_id(&self) -> String { format!("BALANCE:{}", self.coin.ticker) }
+ fn streamer_id(&self) -> StreamerId {
+ StreamerId::Balance {
+ coin: self.coin.ticker.to_string(),
+ }
+ }
async fn handle(
self,
@@ -154,7 +159,7 @@ impl EventStreamer for EthBalanceEventStreamer {
ready_tx: oneshot::Sender>,
_: impl StreamHandlerInput,
) {
- async fn start_polling(streamer_id: String, broadcaster: Broadcaster, coin: EthCoin, interval: f64) {
+ async fn start_polling(streamer_id: StreamerId, broadcaster: Broadcaster, coin: EthCoin, interval: f64) {
async fn sleep_remaining_time(interval: f64, now: Instant) {
// If the interval is x seconds,
// our goal is to broadcast changed balances every x seconds.
diff --git a/mm2src/coins/eth/eth_tests.rs b/mm2src/coins/eth/eth_tests.rs
index 2d2c43d08f..7cde52e740 100644
--- a/mm2src/coins/eth/eth_tests.rs
+++ b/mm2src/coins/eth/eth_tests.rs
@@ -1,7 +1,6 @@
use super::*;
use crate::IguanaPrivKey;
use common::block_on;
-use futures_util::future;
use mm2_core::mm_ctx::MmCtxBuilder;
cfg_native!(
@@ -10,6 +9,7 @@ cfg_native!(
use common::{now_sec, block_on_f01};
use ethkey::{Generator, Random};
+ use futures_util::future;
use mm2_test_helpers::for_tests::{ETH_MAINNET_CHAIN_ID, ETH_MAINNET_NODES, ETH_SEPOLIA_CHAIN_ID, ETH_SEPOLIA_NODES,
ETH_SEPOLIA_TOKEN_CONTRACT};
use mocktopus::mocking::*;
@@ -26,6 +26,9 @@ cfg_native!(
// old way to add some extra gas to the returned value from gas station (non-existent now), still used in tests
const GAS_PRICE_PERCENT: u64 = 10;
+const MATIC_CHAIN_ID: u64 = 137;
+
+const ETH: &str = "ETH";
fn check_sum(addr: &str, expected: &str) {
let actual = checksum_address(addr);
@@ -218,7 +221,7 @@ fn test_withdraw_impl_manual_fee() {
let withdraw_req = WithdrawRequest {
amount: 1.into(),
to: "0x7Bc1bBDD6A0a722fC9bffC49c921B685ECB84b94".to_string(),
- coin: "ETH".to_string(),
+ coin: ETH.to_string(),
fee: Some(WithdrawFee::EthGas {
gas: gas_limit::ETH_MAX_TRADE_GAS,
gas_price: 1.into(),
@@ -230,7 +233,7 @@ fn test_withdraw_impl_manual_fee() {
let tx_details = block_on(withdraw_impl(coin, withdraw_req)).unwrap();
let expected = Some(
EthTxFeeDetails {
- coin: "ETH".into(),
+ coin: ETH.into(),
gas_price: "0.000000001".parse().unwrap(),
gas: gas_limit::ETH_MAX_TRADE_GAS,
total_fee: "0.00015".parse().unwrap(),
@@ -247,7 +250,7 @@ fn test_withdraw_impl_manual_fee() {
fn test_withdraw_impl_fee_details() {
let (_ctx, coin) = eth_coin_for_test(
EthCoinType::Erc20 {
- platform: "ETH".to_string(),
+ platform: ETH.to_string(),
token_addr: Address::from_str(ETH_SEPOLIA_TOKEN_CONTRACT).unwrap(),
},
&["http://dummy.dummy"],
@@ -276,7 +279,7 @@ fn test_withdraw_impl_fee_details() {
let tx_details = block_on(withdraw_impl(coin, withdraw_req)).unwrap();
let expected = Some(
EthTxFeeDetails {
- coin: "ETH".into(),
+ coin: ETH.into(),
gas_price: "0.000000001".parse().unwrap(),
gas: gas_limit::ETH_MAX_TRADE_GAS,
total_fee: "0.00015".parse().unwrap(),
@@ -313,7 +316,7 @@ fn get_sender_trade_preimage() {
fn expected_fee(gas_price: u64, gas_limit: u64) -> TradeFee {
let amount = u256_to_big_decimal((gas_limit * gas_price).into(), 18).expect("!u256_to_big_decimal");
TradeFee {
- coin: "ETH".to_owned(),
+ coin: ETH.to_owned(),
amount: amount.into(),
paid_from_trading_vol: false,
}
@@ -381,7 +384,7 @@ fn get_erc20_sender_trade_preimage() {
fn expected_trade_fee(gas_limit: u64, gas_price: u64) -> TradeFee {
let amount = u256_to_big_decimal((gas_limit * gas_price).into(), 18).expect("!u256_to_big_decimal");
TradeFee {
- coin: "ETH".to_owned(),
+ coin: ETH.to_owned(),
amount: amount.into(),
paid_from_trading_vol: false,
}
@@ -389,7 +392,7 @@ fn get_erc20_sender_trade_preimage() {
let (_ctx, coin) = eth_coin_for_test(
EthCoinType::Erc20 {
- platform: "ETH".to_string(),
+ platform: ETH.to_string(),
token_addr: Address::default(),
},
&["http://dummy.dummy"],
@@ -474,7 +477,7 @@ fn get_receiver_trade_preimage() {
let amount =
u256_to_big_decimal((gas_limit::ETH_RECEIVER_SPEND * GAS_PRICE).into(), 18).expect("!u256_to_big_decimal");
let expected_fee = TradeFee {
- coin: "ETH".to_owned(),
+ coin: ETH.to_owned(),
amount: amount.into(),
paid_from_trading_vol: false,
};
@@ -497,7 +500,7 @@ fn test_get_fee_to_send_taker_fee() {
// fee to send taker fee is `TRANSFER_GAS_LIMIT * gas_price` always.
let amount = u256_to_big_decimal((TRANSFER_GAS_LIMIT * GAS_PRICE).into(), 18).expect("!u256_to_big_decimal");
let expected_fee = TradeFee {
- coin: "ETH".to_owned(),
+ coin: ETH.to_owned(),
amount: amount.into(),
paid_from_trading_vol: false,
};
@@ -514,7 +517,7 @@ fn test_get_fee_to_send_taker_fee() {
let (_ctx, coin) = eth_coin_for_test(
EthCoinType::Erc20 {
- platform: "ETH".to_string(),
+ platform: ETH.to_string(),
token_addr: Address::from_str("0xaD22f63404f7305e4713CcBd4F296f34770513f4").unwrap(),
},
&["http://dummy.dummy"],
@@ -544,7 +547,7 @@ fn test_get_fee_to_send_taker_fee_insufficient_balance() {
EthCoin::get_gas_price.mock_safe(|_| MockResult::Return(Box::pin(futures::future::ok(40.into()))));
let (_ctx, coin) = eth_coin_for_test(
EthCoinType::Erc20 {
- platform: "ETH".to_string(),
+ platform: ETH.to_string(),
token_addr: Address::from_str("0xaD22f63404f7305e4713CcBd4F296f34770513f4").unwrap(),
},
ETH_MAINNET_NODES,
@@ -597,7 +600,7 @@ fn validate_dex_fee_invalid_sender_eth() {
fn validate_dex_fee_invalid_sender_erc() {
let (_ctx, coin) = eth_coin_for_test(
EthCoinType::Erc20 {
- platform: "ETH".to_string(),
+ platform: ETH.to_string(),
token_addr: Address::from_str("0xa1d6df714f91debf4e0802a542e13067f31b8262").unwrap(),
},
ETH_MAINNET_NODES,
@@ -671,7 +674,7 @@ fn validate_dex_fee_eth_confirmed_before_min_block() {
fn validate_dex_fee_erc_confirmed_before_min_block() {
let (_ctx, coin) = eth_coin_for_test(
EthCoinType::Erc20 {
- platform: "ETH".to_string(),
+ platform: ETH.to_string(),
token_addr: Address::from_str("0xa1d6df714f91debf4e0802a542e13067f31b8262").unwrap(),
},
ETH_MAINNET_NODES,
@@ -781,11 +784,13 @@ fn polygon_check_if_my_payment_sent() {
"fname": "Polygon",
"rpcport": 80,
"mm2": 1,
- "chain_id": 137,
"avg_blocktime": 0.03,
"required_confirmations": 3,
"protocol": {
- "type": "ETH"
+ "type": "ETH",
+ "protocol_data": {
+ "chain_id": MATIC_CHAIN_ID
+ }
}
});
@@ -802,7 +807,9 @@ fn polygon_check_if_my_payment_sent() {
"MATIC",
&conf,
&request,
- CoinProtocol::ETH,
+ CoinProtocol::ETH {
+ chain_id: MATIC_CHAIN_ID,
+ },
priv_key_policy,
))
.unwrap();
@@ -863,7 +870,7 @@ fn test_sign_verify_message() {
);
let message = "test";
- let signature = coin.sign_message(message).unwrap();
+ let signature = coin.sign_message(message, None).unwrap();
assert_eq!(signature, "0xcdf11a9c4591fb7334daa4b21494a2590d3f7de41c7d2b333a5b61ca59da9b311b492374cc0ba4fbae53933260fa4b1c18f15d95b694629a7b0620eec77a938600");
let is_valid = coin
@@ -877,7 +884,7 @@ fn test_sign_verify_message() {
fn test_eth_extract_secret() {
let key_pair = Random.generate().unwrap();
let coin_type = EthCoinType::Erc20 {
- platform: "ETH".to_string(),
+ platform: ETH.to_string(),
token_addr: Address::from_str("0xc0eb7aed740e1796992a08962c15661bdeb58003").unwrap(),
};
let (_ctx, coin) = eth_coin_from_keypair(coin_type, &["http://dummy.dummy"], None, key_pair, ETH_SEPOLIA_CHAIN_ID);
@@ -934,11 +941,13 @@ fn test_eth_validate_valid_and_invalid_pubkey() {
"fname": "Polygon",
"rpcport": 80,
"mm2": 1,
- "chain_id": 137,
"avg_blocktime": 0.03,
"required_confirmations": 3,
"protocol": {
- "type": "ETH"
+ "type": "ETH",
+ "protocol_data": {
+ "chain_id": MATIC_CHAIN_ID
+ }
}
});
@@ -959,7 +968,9 @@ fn test_eth_validate_valid_and_invalid_pubkey() {
"MATIC",
&conf,
&request,
- CoinProtocol::ETH,
+ CoinProtocol::ETH {
+ chain_id: MATIC_CHAIN_ID,
+ },
priv_key_policy,
))
.unwrap();
@@ -975,6 +986,123 @@ fn test_eth_validate_valid_and_invalid_pubkey() {
assert!(coin.validate_other_pubkey(&[1u8; 8]).is_err());
}
+#[test]
+fn test_get_enabled_erc20_by_contract_and_platform() {
+ use super::erc20::get_enabled_erc20_by_platform_and_contract;
+ use crate::rpc_command::get_enabled_coins::{get_enabled_coins_rpc, GetEnabledCoinsRequest};
+ const BNB_TOKEN: &str = "1INCH-BEP20";
+ const ETH_TOKEN: &str = "1INCH-ERC20";
+
+ let conf = json!({
+ "coins": [{
+ "coin": "BNB",
+ "name": "binancesmartchain",
+ "fname": "Binance Coin",
+ "avg_blocktime": 3,
+ "rpcport": 80,
+ "mm2": 1,
+ "use_access_list": true,
+ "max_eth_tx_type": 2,
+ "required_confirmations": 3,
+ "protocol": {
+ "type": "ETH",
+ "protocol_data": {
+ "chain_id": 56
+ }
+ },
+ "derivation_path": "m/44'/60'",
+ "trezor_coin": "Binance Smart Chain",
+ "links": {
+ "homepage": "https://www.binance.org"
+ }
+ },{
+ "coin": BNB_TOKEN,
+ "name": "1inch_bep20",
+ "fname": "1Inch",
+ "rpcport": 80,
+ "mm2": 1,
+ "avg_blocktime": 3,
+ "required_confirmations": 3,
+ "protocol": {
+ "type": "ERC20",
+ "protocol_data": {
+ "platform": "BNB",
+ "contract_address": "0x111111111117dC0aa78b770fA6A738034120C302"
+ }
+ },
+ "derivation_path": "m/44'/60'",
+ "use_access_list": true,
+ "max_eth_tx_type": 2,
+ "gas_limit": {
+ "eth_send_erc20": 60000,
+ "erc20_payment": 110000,
+ "erc20_receiver_spend": 85000,
+ "erc20_sender_refund": 85000
+ }
+ },{
+ "coin": "ETH",
+ "name": "ethereum",
+ "fname": "Ethereum",
+ "rpcport": 80,
+ "mm2": 1,
+ "sign_message_prefix": "Ethereum Signed Message:\n",
+ "required_confirmations": 3,
+ "avg_blocktime": 15,
+ "protocol": {
+ "type": "ETH",
+ "protocol_data": {
+ "chain_id": 1
+ }
+ },
+ "derivation_path": "m/44'/60'"
+ },{
+ "coin": ETH_TOKEN,
+ "name": "1inch_erc20",
+ "fname": "1Inch",
+ "rpcport": 80,
+ "mm2": 1,
+ "avg_blocktime": 15,
+ "required_confirmations": 3,
+ "decimals": 18,
+ "protocol": {
+ "type": "ERC20",
+ "protocol_data": {
+ "platform": "ETH",
+ "contract_address": "0x111111111117dC0aa78b770fA6A738034120C302"
+ }
+ },
+ "derivation_path": "m/44'/60'"
+ }]
+ });
+
+ let ctx = MmCtxBuilder::new().with_conf(conf).into_mm_arc();
+ CryptoCtx::init_with_iguana_passphrase(
+ ctx.clone(),
+ "spice describe gravity federal blast come thank unfair canal monkey style afraid",
+ )
+ .unwrap();
+
+ let req_bnb_token = json!({
+ "urls":["https://bsc-dataseed1.binance.org","https://bsc-dataseed1.defibit.io"],
+ "swap_contract_address":"0x9130b257d37a52e52f21054c4da3450c72f595ce",
+ });
+ block_on(lp_coininit(&ctx, BNB_TOKEN, &req_bnb_token)).unwrap();
+
+ let req_eth_token = json!({
+ "urls":["https://ethereum-rpc.publicnode.com", "https://eth.drpc.org"],
+ "swap_contract_address":"0x9130b257d37a52e52f21054c4da3450c72f595ce",
+ });
+ block_on(lp_coininit(&ctx, ETH_TOKEN, &req_eth_token)).unwrap();
+
+ let coins = block_on(get_enabled_coins_rpc(ctx.clone(), GetEnabledCoinsRequest)).unwrap();
+ assert_eq!(coins.coins.len(), 2);
+
+ let contract_address = Address::from_str("0x111111111117dC0aa78b770fA6A738034120C302").unwrap();
+ let res = block_on(get_enabled_erc20_by_platform_and_contract(&ctx, ETH, &contract_address)).unwrap();
+ assert!(res.is_some());
+ assert_eq!(res.unwrap().platform_ticker(), ETH);
+}
+
#[test]
#[cfg(not(target_arch = "wasm32"))]
fn test_fee_history() {
@@ -996,11 +1124,12 @@ fn test_gas_limit_conf() {
"coin": "ETH",
"name": "ethereum",
"fname": "Ethereum",
- "chain_id": 1337,
"protocol":{
- "type": "ETH"
+ "type": "ETH",
+ "protocol_data": {
+ "chain_id": ETH_SEPOLIA_CHAIN_ID
+ }
},
- "chain_id": 1,
"rpcport": 80,
"mm2": 1,
"gas_limit": {
@@ -1018,7 +1147,7 @@ fn test_gas_limit_conf() {
"urls":ETH_SEPOLIA_NODES,
"swap_contract_address":ETH_SEPOLIA_SWAP_CONTRACT
});
- let coin = block_on(lp_coininit(&ctx, "ETH", &req)).unwrap();
+ let coin = block_on(lp_coininit(&ctx, ETH, &req)).unwrap();
let eth_coin = match coin {
MmCoinEnum::EthCoin(eth_coin) => eth_coin,
_ => panic!("not eth coin"),
diff --git a/mm2src/coins/eth/eth_wasm_tests.rs b/mm2src/coins/eth/eth_wasm_tests.rs
index 287b3fb79a..367e88321d 100644
--- a/mm2src/coins/eth/eth_wasm_tests.rs
+++ b/mm2src/coins/eth/eth_wasm_tests.rs
@@ -2,7 +2,7 @@ use super::*;
use crate::lp_coininit;
use crypto::CryptoCtx;
use mm2_core::mm_ctx::MmCtxBuilder;
-use mm2_test_helpers::for_tests::{ETH_SEPOLIA_NODES, ETH_SEPOLIA_SWAP_CONTRACT};
+use mm2_test_helpers::for_tests::{ETH_SEPOLIA_CHAIN_ID, ETH_SEPOLIA_NODES, ETH_SEPOLIA_SWAP_CONTRACT};
use wasm_bindgen_test::*;
use web_sys::console;
@@ -20,11 +20,12 @@ async fn init_eth_coin_helper() -> Result<(MmArc, MmCoinEnum), String> {
"coin": "ETH",
"name": "ethereum",
"fname": "Ethereum",
- "chain_id": 1337,
"protocol":{
- "type": "ETH"
+ "type": "ETH",
+ "protocol_data": {
+ "chain_id": ETH_SEPOLIA_CHAIN_ID,
+ }
},
- "chain_id": 1,
"rpcport": 80,
"mm2": 1,
"max_eth_tx_type": 2
diff --git a/mm2src/coins/eth/eth_withdraw.rs b/mm2src/coins/eth/eth_withdraw.rs
index b3de177a89..c9822619d6 100644
--- a/mm2src/coins/eth/eth_withdraw.rs
+++ b/mm2src/coins/eth/eth_withdraw.rs
@@ -1,9 +1,10 @@
-use super::{checksum_address, u256_to_big_decimal, wei_from_big_decimal, EthCoinType, EthDerivationMethod,
+use super::{checksum_address, u256_to_big_decimal, wei_from_big_decimal, ChainSpec, EthCoinType, EthDerivationMethod,
EthPrivKeyPolicy, Public, WithdrawError, WithdrawRequest, WithdrawResult, ERC20_CONTRACT, H160, H256};
+use crate::eth::wallet_connect::WcEthTxParams;
use crate::eth::{calc_total_fee, get_eth_gas_details_from_withdraw_fee, tx_builder_with_pay_for_gas_option,
tx_type_from_pay_for_gas_option, Action, Address, EthTxFeeDetails, KeyPair, PayForGasOption,
SignedEthTx, TransactionWrapper, UnSignedEthTxBuilder};
-use crate::hd_wallet::{HDCoinWithdrawOps, HDWalletOps, WithdrawFrom, WithdrawSenderAddress};
+use crate::hd_wallet::{HDAddressSelector, HDCoinWithdrawOps, HDWalletOps, WithdrawSenderAddress};
use crate::rpc_command::init_withdraw::{WithdrawInProgressStatus, WithdrawTaskHandleShared};
use crate::{BytesJson, CoinWithDerivationMethod, EthCoin, GetWithdrawSenderAddress, PrivKeyPolicy, TransactionData,
TransactionDetails};
@@ -16,6 +17,7 @@ use crypto::trezor::trezor_rpc_task::{TrezorRequestStatuses, TrezorRpcTaskProces
use crypto::{CryptoCtx, HwRpcError};
use ethabi::Token;
use futures::compat::Future01CompatExt;
+use kdf_walletconnect::{WalletConnectCtx, WalletConnectOps};
use mm2_core::mm_ctx::MmArc;
use mm2_err_handle::map_mm_error::MapMmError;
use mm2_err_handle::mm_error::MmResult;
@@ -89,10 +91,12 @@ where
/// Gets the derivation path for the address from which the withdrawal is made using the `from` parameter.
#[allow(clippy::result_large_err)]
- fn get_from_derivation_path(&self, from: &WithdrawFrom) -> Result> {
+ fn get_from_derivation_path(&self, from: &HDAddressSelector) -> Result> {
let coin = self.coin();
let path_to_coin = &coin.deref().derivation_method.hd_wallet_or_err()?.derivation_path;
- let path_to_address = from.to_address_path(path_to_coin.coin_type())?;
+ let path_to_address = from
+ .to_address_path(path_to_coin.coin_type())
+ .mm_err(|err| WithdrawError::UnexpectedFromAddress(err.to_string()))?;
let derivation_path = path_to_address.to_derivation_path(path_to_coin)?;
Ok(derivation_path)
}
@@ -128,7 +132,16 @@ where
match coin.priv_key_policy {
EthPrivKeyPolicy::Iguana(_) | EthPrivKeyPolicy::HDWallet { .. } => {
let key_pair = self.get_key_pair(req)?;
- let signed = unsigned_tx.sign(key_pair.secret(), Some(coin.chain_id))?;
+ let chain_id = match coin.chain_spec {
+ ChainSpec::Evm { chain_id } => chain_id,
+ // Todo: Tron have different transaction signing algorithm, we should probably have a trait abstracting both
+ ChainSpec::Tron { .. } => {
+ return MmError::err(WithdrawError::InternalError(
+ "Tron is not supported for withdraw yet".to_owned(),
+ ))
+ },
+ };
+ let signed = unsigned_tx.sign(key_pair.secret(), Some(chain_id))?;
let bytes = rlp::encode(&signed);
Ok((signed.tx_hash(), BytesJson::from(bytes.to_vec())))
@@ -139,6 +152,9 @@ where
let bytes = rlp::encode(&signed);
Ok((signed.tx_hash(), BytesJson::from(bytes.to_vec())))
},
+ EthPrivKeyPolicy::WalletConnect { .. } => {
+ MmError::err(WithdrawError::InternalError("invalid policy".to_owned()))
+ },
#[cfg(target_arch = "wasm32")]
EthPrivKeyPolicy::Metamask(_) => MmError::err(WithdrawError::InternalError("invalid policy".to_owned())),
}
@@ -162,7 +178,7 @@ where
}
// Wait for 10 seconds for the transaction to appear on the RPC node.
- let wait_rpc_timeout = 10_000;
+ let wait_rpc_timeout = 10;
let check_every = 1.;
// Please note that this method may take a long time
@@ -178,7 +194,10 @@ where
.unwrap_or_default();
Ok((tx_hash, tx_hex))
},
- EthPrivKeyPolicy::Iguana(_) | EthPrivKeyPolicy::HDWallet { .. } | EthPrivKeyPolicy::Trezor => {
+ EthPrivKeyPolicy::Iguana(_)
+ | EthPrivKeyPolicy::HDWallet { .. }
+ | EthPrivKeyPolicy::Trezor
+ | EthPrivKeyPolicy::WalletConnect { .. } => {
MmError::err(WithdrawError::InternalError("invalid policy".to_owned()))
},
}
@@ -292,6 +311,51 @@ where
};
self.send_withdraw_tx(&req, tx_to_send).await?
},
+ EthPrivKeyPolicy::WalletConnect { .. } => {
+ let ctx = MmArc::from_weak(&coin.ctx).expect("No context");
+ let wc = WalletConnectCtx::from_ctx(&ctx)
+ .expect("TODO: handle error when enable kdf initialization without key.");
+ // Todo: Tron will have to be set with `ChainSpec::Evm` to work with walletconnect.
+ // This means setting the protocol as `ETH` in coin config and having a different coin for this mode.
+ let chain_id = coin.chain_spec.chain_id().ok_or(WithdrawError::UnsupportedError(
+ "WalletConnect needs chain_id to be set".to_owned(),
+ ))?;
+ let gas_price = pay_for_gas_option.get_gas_price();
+ let (max_fee_per_gas, max_priority_fee_per_gas) = pay_for_gas_option.get_fee_per_gas();
+ let (nonce, _) = coin
+ .clone()
+ .get_addr_nonce(my_address)
+ .compat()
+ .timeout_secs(30.)
+ .await?
+ .map_to_mm(WithdrawError::Transport)?;
+ let params = WcEthTxParams {
+ gas,
+ nonce,
+ data: &data,
+ my_address,
+ action: Action::Call(call_addr),
+ value: eth_value,
+ gas_price,
+ chain_id,
+ max_fee_per_gas,
+ max_priority_fee_per_gas,
+ };
+
+ let (tx, bytes) = if req.broadcast {
+ self.coin()
+ .wc_send_tx(&wc, params)
+ .await
+ .mm_err(|err| WithdrawError::SigningError(err.to_string()))?
+ } else {
+ self.coin()
+ .wc_sign_tx(&wc, params)
+ .await
+ .mm_err(|err| WithdrawError::SigningError(err.to_string()))?
+ };
+
+ (tx.tx_hash(), bytes)
+ },
};
self.on_finishing()?;
@@ -374,8 +438,17 @@ impl EthWithdraw for InitEthWithdraw {
let sign_processor = TrezorRpcTaskProcessor::new(self.task_handle.clone(), trezor_statuses);
let sign_processor = Arc::new(sign_processor);
let mut trezor_session = hw_ctx.trezor(sign_processor).await?;
+ let chain_id = match coin.chain_spec {
+ ChainSpec::Evm { chain_id } => chain_id,
+ // Todo: Add support for Tron signing with Trezor
+ ChainSpec::Tron { .. } => {
+ return MmError::err(WithdrawError::InternalError(
+ "Tron is not supported for withdraw yet".to_owned(),
+ ))
+ },
+ };
let unverified_tx = trezor_session
- .sign_eth_tx(derivation_path, unsigned_tx, coin.chain_id)
+ .sign_eth_tx(derivation_path, unsigned_tx, chain_id)
.await?;
Ok(SignedEthTx::new(unverified_tx).map_to_mm(|err| WithdrawError::InternalError(err.to_string()))?)
}
diff --git a/mm2src/coins/eth/fee_estimation/eth_fee_events.rs b/mm2src/coins/eth/fee_estimation/eth_fee_events.rs
index 0af1f13579..1c79e7da40 100644
--- a/mm2src/coins/eth/fee_estimation/eth_fee_events.rs
+++ b/mm2src/coins/eth/fee_estimation/eth_fee_events.rs
@@ -1,7 +1,7 @@
use super::ser::FeePerGasEstimated;
use crate::eth::EthCoin;
use common::executor::Timer;
-use mm2_event_stream::{Broadcaster, Event, EventStreamer, NoDataIn, StreamHandlerInput};
+use mm2_event_stream::{Broadcaster, Event, EventStreamer, NoDataIn, StreamHandlerInput, StreamerId};
use async_trait::async_trait;
use compatible_time::Instant;
@@ -52,7 +52,11 @@ impl EthFeeEventStreamer {
impl EventStreamer for EthFeeEventStreamer {
type DataInType = NoDataIn;
- fn streamer_id(&self) -> String { format!("FEE_ESTIMATION:{}", self.coin.ticker) }
+ fn streamer_id(&self) -> StreamerId {
+ StreamerId::FeeEstimation {
+ coin: self.coin.ticker.to_string(),
+ }
+ }
async fn handle(
self,
diff --git a/mm2src/coins/eth/for_tests.rs b/mm2src/coins/eth/for_tests.rs
index 781748832c..9652ba0a80 100644
--- a/mm2src/coins/eth/for_tests.rs
+++ b/mm2src/coins/eth/for_tests.rs
@@ -55,6 +55,7 @@ pub(crate) fn eth_coin_from_keypair(
let eth_coin = EthCoin(Arc::new(EthCoinImpl {
coin_type,
+ chain_spec: ChainSpec::Evm { chain_id },
decimals: 18,
history_sync_state: Mutex::new(HistorySyncState::NotEnabled),
sign_message_prefix: Some(String::from("Ethereum Signed Message:\n")),
@@ -69,7 +70,6 @@ pub(crate) fn eth_coin_from_keypair(
ctx: ctx.weak(),
required_confirmations: 1.into(),
swap_txfee_policy: Mutex::new(SwapTxFeePolicy::Internal),
- chain_id,
trezor_coin: None,
logs_block_range: DEFAULT_LOGS_BLOCK_RANGE,
address_nonce_locks: Arc::new(AsyncMutex::new(new_nonce_lock())),
diff --git a/mm2src/coins/eth/tron.rs b/mm2src/coins/eth/tron.rs
new file mode 100644
index 0000000000..c07307c13d
--- /dev/null
+++ b/mm2src/coins/eth/tron.rs
@@ -0,0 +1,24 @@
+//! Minimal Tron placeholders for EthCoin integration.
+//! These types will be expanded with full TRON logic in later steps.
+
+mod address;
+pub use address::Address as TronAddress;
+
+/// Represents TRON chain/network.
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub enum Network {
+ Mainnet,
+ Shasta,
+ Nile,
+ // TODO: Add more networks as needed.
+}
+
+/// Placeholder for a TRON client.
+#[derive(Clone, Debug)]
+pub struct TronClient;
+
+/// Placeholder for TRON fee params.
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct TronFeeParams {
+ // TODO: Add TRON-specific fields in future steps.
+}
diff --git a/mm2src/coins/eth/tron/address.rs b/mm2src/coins/eth/tron/address.rs
new file mode 100644
index 0000000000..0d4a45e07c
--- /dev/null
+++ b/mm2src/coins/eth/tron/address.rs
@@ -0,0 +1,167 @@
+//! TRON address handling (base58, hex, validation, serde).
+
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use std::convert::{TryFrom, TryInto};
+use std::fmt;
+use std::str::FromStr;
+
+pub const ADDRESS_PREFIX: u8 = 0x41;
+pub const ADDRESS_BASE58_PREFIX: char = 'T';
+pub const ADDRESS_HEX_LEN: usize = 42;
+pub const ADDRESS_BYTES_LEN: usize = 21;
+pub const ADDRESS_BASE58_LEN: usize = 34;
+
+/// TRON mainnet or testnet address (21 bytes, 0x41 prefix + 20-bytes).
+#[derive(Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
+pub struct Address {
+ pub inner: [u8; ADDRESS_BYTES_LEN],
+}
+
+impl Address {
+ /// Construct from raw 21 bytes (must be 0x41-prefixed).
+ pub fn from_bytes(bytes: [u8; ADDRESS_BYTES_LEN]) -> Result {
+ if bytes[0] != ADDRESS_PREFIX {
+ return Err("TRON address must start with 0x41".into());
+ }
+ Ok(Self { inner: bytes })
+ }
+
+ /// Construct from base58 string (with checksum).
+ pub fn from_base58(s: &str) -> Result {
+ let data = bs58::decode(s)
+ .with_check(None)
+ .into_vec()
+ .map_err(|e| format!("Invalid base58check address: {}", e))?;
+
+ // SAFETY: Accessing `data[0]` is safe here because we first check that
+ // `data.len() == ADDRESS_BYTES_LEN`, guaranteeing the slice is not empty
+ // and has at least one element.
+ if data.len() != ADDRESS_BYTES_LEN || data[0] != ADDRESS_PREFIX {
+ return Err(format!(
+ "Invalid address: expected {} bytes with prefix 0x{:x}",
+ ADDRESS_BYTES_LEN, ADDRESS_PREFIX
+ ));
+ }
+
+ let inner = data
+ .try_into()
+ .map_err(|_| "Failed to convert address bytes to array".to_string())?;
+
+ Ok(Self { inner })
+ }
+
+ /// Construct from hex string, with or without `0x` prefix.
+ pub fn from_hex(s: &str) -> Result {
+ let s = s.strip_prefix("0x").unwrap_or(s);
+ let data = hex::decode(s).map_err(|e| format!("Invalid hex address: {}", e))?;
+
+ // SAFETY: Accessing `data[0]` is safe here because we first check that
+ // `data.len() == ADDRESS_BYTES_LEN`, guaranteeing the slice is not empty
+ // and has at least one element.
+ if data.len() != ADDRESS_BYTES_LEN || data[0] != ADDRESS_PREFIX {
+ return Err(format!(
+ "Invalid address: expected {} bytes with prefix 0x{:x}",
+ ADDRESS_BYTES_LEN, ADDRESS_PREFIX
+ ));
+ }
+
+ let inner = data
+ .try_into()
+ .map_err(|_| "Failed to convert address bytes to array".to_string())?;
+
+ Ok(Self { inner })
+ }
+
+ /// Show as base58 string (canonical user format).
+ pub fn to_base58(&self) -> String { bs58::encode(self.inner).with_check().into_string() }
+
+ /// Show as hex string, lowercase (canonical hex format).
+ pub fn to_hex(&self) -> String { hex::encode(self.inner) }
+
+ /// Return the 21 bytes (0x41 + 20).
+ pub fn as_bytes(&self) -> &[u8] { &self.inner }
+}
+
+impl TryFrom<[u8; ADDRESS_BYTES_LEN]> for Address {
+ type Error = String;
+
+ fn try_from(bytes: [u8; ADDRESS_BYTES_LEN]) -> Result { Self::from_bytes(bytes) }
+}
+
+impl AsRef<[u8]> for Address {
+ fn as_ref(&self) -> &[u8] { &self.inner }
+}
+
+impl fmt::Display for Address {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "{}", self.to_base58()) }
+}
+
+impl fmt::Debug for Address {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ write!(f, "Address({} / 0x{})", self.to_base58(), self.to_hex())
+ }
+}
+
+impl Serialize for Address {
+ fn serialize(&self, serializer: S) -> Result
+ where
+ S: Serializer,
+ {
+ serializer.serialize_str(&self.to_base58())
+ }
+}
+
+impl<'de> Deserialize<'de> for Address {
+ fn deserialize(deserializer: D) -> Result
+ where
+ D: Deserializer<'de>,
+ {
+ let s = <&str>::deserialize(deserializer)?;
+ Address::from_str(s).map_err(serde::de::Error::custom)
+ }
+}
+
+impl FromStr for Address {
+ type Err = String;
+
+ fn from_str(s: &str) -> Result {
+ // Check for Base58 format
+ if s.len() == ADDRESS_BASE58_LEN && s.starts_with(ADDRESS_BASE58_PREFIX) {
+ return Self::from_base58(s);
+ }
+
+ // Check for hex format (with or without 0x prefix)
+ if (s.len() == ADDRESS_HEX_LEN && s.starts_with("41"))
+ || (s.len() == ADDRESS_HEX_LEN + 2 && s.starts_with("0x41"))
+ {
+ return Self::from_hex(s);
+ }
+
+ Err(format!(
+ "Invalid TRON address '{}': must be Base58 (34 chars starting with 'T') or hex (42 chars without 0x, 44 chars with 0x prefix)",
+ s
+ ))
+ }
+}
+
+#[cfg(test)]
+mod test {
+ use super::*;
+
+ #[test]
+ fn test_tron_address_base58_and_hex() {
+ let base58 = "TNPeeaaFB7K9cmo4uQpcU32zGK8G1NYqeL";
+ let hex = "418840e6c55b9ada326d211d818c34a994aeced808";
+ let addr1 = Address::from_str(base58).unwrap();
+ let addr2 = Address::from_str(hex).unwrap();
+ assert_eq!(addr1, addr2);
+ assert_eq!(addr1.to_hex(), hex);
+ assert_eq!(addr2.to_base58(), base58);
+ }
+
+ #[test]
+ fn test_invalid_tron_address() {
+ assert!(Address::from_str("foo").is_err());
+ assert!(Address::from_str("0xdeadbeef").is_err());
+ }
+}
diff --git a/mm2src/coins/eth/v2_activation.rs b/mm2src/coins/eth/v2_activation.rs
index 4e04bfebed..9bcd2d6c57 100644
--- a/mm2src/coins/eth/v2_activation.rs
+++ b/mm2src/coins/eth/v2_activation.rs
@@ -1,5 +1,5 @@
use super::*;
-use crate::eth::erc20::{get_enabled_erc20_by_contract, get_token_decimals};
+use crate::eth::erc20::{get_enabled_erc20_by_platform_and_contract, get_token_decimals};
use crate::eth::web3_transport::http_transport::HttpTransport;
use crate::hd_wallet::{load_hd_accounts_from_storage, HDAccountsMutex, HDPathAccountToAddressId, HDWalletCoinStorage,
HDWalletStorageError, DEFAULT_GAP_LIMIT};
@@ -7,10 +7,13 @@ use crate::nft::get_nfts_for_activation;
use crate::nft::nft_errors::{GetNftInfoError, ParseChainTypeError};
use crate::nft::nft_structs::Chain;
#[cfg(target_arch = "wasm32")] use crate::EthMetamaskPolicy;
+
use common::executor::AbortedError;
use compatible_time::Instant;
use crypto::{trezor::TrezorError, Bip32Error, CryptoCtxError, HwError};
use enum_derives::EnumFromTrait;
+use ethereum_types::H264;
+use kdf_walletconnect::error::WalletConnectError;
use mm2_err_handle::common_errors::WithInternal;
#[cfg(target_arch = "wasm32")]
use mm2_metamask::{from_metamask_error, MetamaskError, MetamaskRpcError, WithMetamaskRpcError};
@@ -21,7 +24,9 @@ use std::sync::atomic::Ordering;
use url::Url;
use web3_transport::websocket_transport::WebsocketTransport;
-#[derive(Clone, Debug, Deserialize, Display, EnumFromTrait, PartialEq, Serialize, SerializeErrorType)]
+#[derive(
+ Clone, Debug, Deserialize, Display, EnumFromTrait, EnumFromStringify, PartialEq, Serialize, SerializeErrorType,
+)]
#[serde(tag = "error_type", content = "error_data")]
pub enum EthActivationV2Error {
InvalidPayload(String),
@@ -30,6 +35,11 @@ pub enum EthActivationV2Error {
InvalidPathToAddress(String),
#[display(fmt = "`chain_id` should be set for evm coins or tokens")]
ChainIdNotSet,
+ #[display(fmt = "{} chains don't support {}", chain, feature)]
+ UnsupportedChain {
+ chain: String,
+ feature: String,
+ },
#[display(fmt = "Platform coin {} activation failed. {}", ticker, error)]
ActivationFailed {
ticker: String,
@@ -65,6 +75,9 @@ pub enum EthActivationV2Error {
InvalidHardwareWalletCall,
#[display(fmt = "Custom token error: {}", _0)]
CustomTokenError(CustomTokenError),
+ // TODO: Map WalletConnectError to distinct error categories (transport, invalid payload) after refactoring.
+ #[from_stringify("WalletConnectError")]
+ WalletConnectError(String),
}
impl From for EthActivationV2Error {
@@ -155,12 +168,16 @@ impl From for EthActivationV2Error {
/// An alternative to `crate::PrivKeyActivationPolicy`, typical only for ETH coin.
#[derive(Clone, Deserialize, Default)]
+#[serde(tag = "type", content = "params")]
pub enum EthPrivKeyActivationPolicy {
#[default]
ContextPrivKey,
Trezor,
#[cfg(target_arch = "wasm32")]
Metamask,
+ WalletConnect {
+ session_topic: String,
+ },
}
impl EthPrivKeyActivationPolicy {
@@ -397,7 +414,7 @@ impl EthCoin {
// Todo: when custom token config storage is added, this might not be needed
// `is_custom` was added to avoid this unnecessary check for non-custom tokens
if is_custom {
- match get_enabled_erc20_by_contract(&ctx, protocol.token_addr).await {
+ match get_enabled_erc20_by_platform_and_contract(&ctx, &protocol.platform, &protocol.token_addr).await {
Ok(Some(token)) => {
return MmError::err(EthTokenActivationError::CustomTokenError(
CustomTokenError::TokenWithSameContractAlreadyActivated {
@@ -454,6 +471,7 @@ impl EthCoin {
// storage ticker will be the platform coin ticker
derivation_method: self.derivation_method.clone(),
coin_type,
+ chain_spec: self.chain_spec.clone(),
sign_message_prefix: self.sign_message_prefix.clone(),
swap_contract_address: self.swap_contract_address,
swap_v2_contracts: self.swap_v2_contracts,
@@ -467,7 +485,6 @@ impl EthCoin {
max_eth_tx_type,
ctx: self.ctx.clone(),
required_confirmations,
- chain_id: self.chain_id,
trezor_coin: self.trezor_coin.clone(),
logs_block_range: self.logs_block_range,
address_nonce_locks: self.address_nonce_locks.clone(),
@@ -540,6 +557,7 @@ impl EthCoin {
let global_nft = EthCoinImpl {
ticker,
coin_type,
+ chain_spec: self.chain_spec.clone(),
priv_key_policy: self.priv_key_policy.clone(),
derivation_method: self.derivation_method.clone(),
sign_message_prefix: self.sign_message_prefix.clone(),
@@ -554,7 +572,6 @@ impl EthCoin {
max_eth_tx_type,
required_confirmations,
ctx: self.ctx.clone(),
- chain_id: self.chain_id,
trezor_coin: self.trezor_coin.clone(),
logs_block_range: self.logs_block_range,
address_nonce_locks: self.address_nonce_locks.clone(),
@@ -576,6 +593,7 @@ pub async fn eth_coin_from_conf_and_request_v2(
conf: &Json,
req: EthActivationV2Request,
priv_key_build_policy: EthPrivKeyBuildPolicy,
+ chain_spec: ChainSpec,
) -> MmResult {
if req.swap_contract_address == Address::default() {
return Err(EthActivationV2Error::InvalidSwapContractAddr(
@@ -620,14 +638,19 @@ pub async fn eth_coin_from_conf_and_request_v2(
)
.await?;
- let chain_id = conf["chain_id"].as_u64().ok_or(EthActivationV2Error::ChainIdNotSet)?;
let web3_instances = match (req.rpc_mode, &priv_key_policy) {
(EthRpcMode::Default, EthPrivKeyPolicy::Iguana(_) | EthPrivKeyPolicy::HDWallet { .. })
- | (EthRpcMode::Default, EthPrivKeyPolicy::Trezor) => {
+ | (EthRpcMode::Default, EthPrivKeyPolicy::Trezor)
+ | (EthRpcMode::Default, EthPrivKeyPolicy::WalletConnect { .. }) => {
build_web3_instances(ctx, ticker.to_string(), req.nodes.clone()).await?
},
#[cfg(target_arch = "wasm32")]
(EthRpcMode::Metamask, EthPrivKeyPolicy::Metamask(_)) => {
+ // Metamask doesn't support native Tron
+ let chain_id = chain_spec.chain_id().ok_or(EthActivationV2Error::UnsupportedChain {
+ chain: chain_spec.kind().to_string(),
+ feature: "Metamask".to_string(),
+ })?;
build_metamask_transport(ctx, ticker.to_string(), chain_id).await?
},
#[cfg(target_arch = "wasm32")]
@@ -675,6 +698,7 @@ pub async fn eth_coin_from_conf_and_request_v2(
priv_key_policy,
derivation_method: Arc::new(derivation_method),
coin_type,
+ chain_spec,
sign_message_prefix,
swap_contract_address: req.swap_contract_address,
swap_v2_contracts: req.swap_v2_contracts,
@@ -688,7 +712,6 @@ pub async fn eth_coin_from_conf_and_request_v2(
max_eth_tx_type,
ctx: ctx.weak(),
required_confirmations,
- chain_id,
trezor_coin,
logs_block_range: conf["logs_block_range"].as_u64().unwrap_or(DEFAULT_LOGS_BLOCK_RANGE),
address_nonce_locks,
@@ -802,6 +825,21 @@ pub(crate) async fn build_address_and_priv_key_policy(
DerivationMethod::SingleAddress(address),
))
},
+ EthPrivKeyBuildPolicy::WalletConnect {
+ address,
+ public_key_uncompressed,
+ session_topic,
+ } => {
+ let public_key = compress_public_key(public_key_uncompressed)?;
+ Ok((
+ EthPrivKeyPolicy::WalletConnect {
+ public_key,
+ public_key_uncompressed,
+ session_topic,
+ },
+ DerivationMethod::SingleAddress(address),
+ ))
+ },
}
}
@@ -818,7 +856,7 @@ async fn build_web3_instances(
eth_nodes.as_mut_slice().shuffle(&mut rng);
drop_mutability!(eth_nodes);
- let event_handlers = rpc_event_handlers_for_eth_transport(ctx, coin_ticker.clone());
+ let event_handlers = rpc_event_handlers_for_eth_transport(ctx, coin_ticker);
let mut web3_instances = Vec::with_capacity(eth_nodes.len());
for eth_node in eth_nodes {
@@ -973,10 +1011,10 @@ async fn check_metamask_supports_chain_id(
}
}
-#[cfg(target_arch = "wasm32")]
fn compress_public_key(uncompressed: H520) -> MmResult {
let public_key = PublicKey::from_slice(uncompressed.as_bytes())
.map_to_mm(|e| EthActivationV2Error::InternalError(e.to_string()))?;
let compressed = public_key.serialize();
+
Ok(H264::from(compressed))
}
diff --git a/mm2src/coins/eth/wallet_connect.rs b/mm2src/coins/eth/wallet_connect.rs
new file mode 100644
index 0000000000..2bc241342e
--- /dev/null
+++ b/mm2src/coins/eth/wallet_connect.rs
@@ -0,0 +1,298 @@
+/// https://docs.reown.com/advanced/multichain/rpc-reference/ethereum-rpc
+use super::{ChainSpec, EthCoin, EthPrivKeyPolicy};
+
+use crate::common::Future01CompatExt;
+use crate::hd_wallet::AddrToString;
+use crate::Eip1559Ops;
+use crate::{BytesJson, MarketCoinOps, TransactionErr};
+
+use common::log::info;
+use common::u256_to_hex;
+use derive_more::Display;
+use enum_derives::EnumFromStringify;
+use ethcore_transaction::{Action, SignedTransaction};
+use ethereum_types::H256;
+use ethereum_types::{Address, Public, H160, H520, U256};
+use ethkey::{public_to_address, Message, Signature};
+use kdf_walletconnect::chain::{WcChainId, WcRequestMethods};
+use kdf_walletconnect::error::WalletConnectError;
+use kdf_walletconnect::{WalletConnectCtx, WalletConnectOps};
+use mm2_err_handle::prelude::*;
+use secp256k1::recovery::{RecoverableSignature, RecoveryId};
+use secp256k1::{PublicKey, Secp256k1};
+use std::iter::FromIterator;
+use std::str::FromStr;
+use web3::signing::hash_message;
+
+// Wait for 60 seconds for the transaction to appear on the RPC node.
+const WAIT_RPC_TIMEOUT_SECS: u64 = 60;
+
+#[derive(Display, Debug, EnumFromStringify)]
+pub enum EthWalletConnectError {
+ UnsupportedChainId(WcChainId),
+ InvalidSignature(String),
+ AccountMisMatch(String),
+ #[from_stringify("rlp::DecoderError", "hex::FromHexError")]
+ TxDecodingFailed(String),
+ #[from_stringify("ethkey::Error")]
+ InternalError(String),
+ InvalidTxData(String),
+ SessionError(String),
+ WalletConnectError(WalletConnectError),
+}
+
+impl From for EthWalletConnectError {
+ fn from(value: WalletConnectError) -> Self { Self::WalletConnectError(value) }
+}
+
+/// Eth Params required for constructing WalletConnect transaction.
+pub struct WcEthTxParams<'a> {
+ pub(crate) gas: U256,
+ pub(crate) nonce: U256,
+ pub(crate) data: &'a [u8],
+ pub(crate) my_address: H160,
+ pub(crate) action: Action,
+ pub(crate) value: U256,
+ pub(crate) gas_price: Option,
+ pub(crate) chain_id: u64,
+ pub(crate) max_fee_per_gas: Option,
+ pub(crate) max_priority_fee_per_gas: Option,
+}
+
+impl<'a> WcEthTxParams<'a> {
+ /// Construct WalletConnect transaction json from from `WcEthTxParams`
+ fn prepare_wc_tx_format(&self) -> MmResult {
+ let mut tx_object = serde_json::Map::from_iter([
+ ("chainId".to_string(), json!(self.chain_id)),
+ ("nonce".to_string(), json!(u256_to_hex(self.nonce))),
+ ("from".to_string(), json!(self.my_address.addr_to_string())),
+ ("gasLimit".to_string(), json!(u256_to_hex(self.gas))),
+ ("value".to_string(), json!(u256_to_hex(self.value))),
+ ("data".to_string(), json!(format!("0x{}", hex::encode(self.data)))),
+ ]);
+
+ if let Some(gas_price) = self.gas_price {
+ tx_object.insert("gasPrice".to_string(), json!(u256_to_hex(gas_price)));
+ }
+
+ if let Some(max_fee_per_gas) = self.max_fee_per_gas {
+ tx_object.insert("maxFeePerGas".to_string(), json!(u256_to_hex(max_fee_per_gas)));
+ }
+
+ if let Some(max_priority_fee_per_gas) = self.max_priority_fee_per_gas {
+ tx_object.insert(
+ "maxPriorityFeePerGas".to_string(),
+ json!(u256_to_hex(max_priority_fee_per_gas)),
+ );
+ }
+
+ if let Action::Call(addr) = self.action {
+ tx_object.insert("to".to_string(), json!(format!("0x{}", hex::encode(addr.as_bytes()))));
+ }
+
+ Ok(json!(vec![serde_json::Value::Object(tx_object)]))
+ }
+}
+
+#[async_trait::async_trait]
+impl WalletConnectOps for EthCoin {
+ type Error = MmError;
+ type Params<'a> = WcEthTxParams<'a>;
+ type SignTxData = (SignedTransaction, BytesJson);
+ type SendTxData = (SignedTransaction, BytesJson);
+
+ async fn wc_chain_id(&self, wc: &WalletConnectCtx) -> Result {
+ let session_topic = self.session_topic()?;
+ let chain_id = match self.chain_spec {
+ ChainSpec::Evm { chain_id } => chain_id,
+ // Todo: Add Tron signing logic
+ ChainSpec::Tron { .. } => {
+ return Err(MmError::new(EthWalletConnectError::InternalError(
+ "Tron is not supported for this action yet".into(),
+ )))
+ },
+ };
+ let chain_id = WcChainId::new_eip155(chain_id.to_string());
+ wc.validate_update_active_chain_id(session_topic, &chain_id).await?;
+
+ Ok(chain_id)
+ }
+
+ async fn wc_sign_tx<'a>(
+ &self,
+ wc: &WalletConnectCtx,
+ params: Self::Params<'a>,
+ ) -> Result {
+ let bytes = {
+ let chain_id = self.wc_chain_id(wc).await?;
+ let tx_json = params.prepare_wc_tx_format()?;
+ let session_topic = self.session_topic()?;
+ let tx_hex: String = wc
+ .send_session_request_and_wait(session_topic, &chain_id, WcRequestMethods::EthSignTransaction, tx_json)
+ .await?;
+ // if tx_hex.len() < 4 {
+ // return MmError::err(EthWalletConnectError::TxDecodingFailed(
+ // "invalid transaction hex returned from wallet".to_string(),
+ // ));
+ // }
+ // // First 4 bytes from WalletConnect represents Protoc info
+ let normalized_tx_hex = tx_hex.strip_prefix("0x").unwrap_or(&tx_hex);
+ hex::decode(normalized_tx_hex)?
+ };
+
+ let unverified = rlp::decode(&bytes)?;
+ let signed = SignedTransaction::new(unverified)?;
+ let bytes = rlp::encode(&signed);
+
+ Ok((signed, BytesJson::from(bytes.to_vec())))
+ }
+
+ async fn wc_send_tx<'a>(
+ &self,
+ wc: &WalletConnectCtx,
+ params: Self::Params<'a>,
+ ) -> Result {
+ let tx_hash: String = {
+ let chain_id = self.wc_chain_id(wc).await?;
+ let tx_json = params.prepare_wc_tx_format()?;
+ let session_topic = self.session_topic()?;
+ wc.send_session_request_and_wait(session_topic, &chain_id, WcRequestMethods::EthSendTransaction, tx_json)
+ .await?
+ };
+
+ let tx_hash = tx_hash.strip_prefix("0x").unwrap_or(&tx_hash);
+ let maybe_signed_tx = {
+ self.wait_for_tx_appears_on_rpc(H256::from_slice(&hex::decode(tx_hash)?), WAIT_RPC_TIMEOUT_SECS, 1.)
+ .await
+ .mm_err(|err| EthWalletConnectError::InternalError(err.to_string()))?
+ };
+ let signed_tx = maybe_signed_tx.ok_or(MmError::new(EthWalletConnectError::InternalError(format!(
+ "Waited too long until the transaction {tx_hash:?} appear on the RPC node"
+ ))))?;
+ let tx_hex = BytesJson::from(rlp::encode(&signed_tx).to_vec());
+
+ Ok((signed_tx, tx_hex))
+ }
+
+ fn session_topic(&self) -> Result<&str, Self::Error> {
+ if let EthPrivKeyPolicy::WalletConnect { ref session_topic, .. } = &self.priv_key_policy {
+ return Ok(session_topic);
+ }
+
+ MmError::err(EthWalletConnectError::SessionError(format!(
+ "{} is not activated via WalletConnect",
+ self.ticker()
+ )))
+ }
+}
+
+pub async fn eth_request_wc_personal_sign(
+ wc: &WalletConnectCtx,
+ session_topic: &str,
+ chain_id: u64,
+) -> MmResult<(H520, Address), EthWalletConnectError> {
+ let chain_id = WcChainId::new_eip155(chain_id.to_string());
+ wc.validate_update_active_chain_id(session_topic, &chain_id).await?;
+
+ let (account_str, _) = wc.get_account_and_properties_for_chain_id(session_topic, &chain_id)?;
+ let message = "Authenticate with KDF";
+ let params = {
+ let message_hex = format!("0x{}", hex::encode(message));
+ json!(&[&message_hex, &account_str])
+ };
+ let data = wc
+ .send_session_request_and_wait::(session_topic, &chain_id, WcRequestMethods::PersonalSign, params)
+ .await?;
+
+ Ok(extract_pubkey_from_signature(&data, message, &account_str)
+ .mm_err(|err| WalletConnectError::SessionError(err.to_string()))?)
+}
+
+fn extract_pubkey_from_signature(
+ signature_str: &str,
+ message: &str,
+ account: &str,
+) -> MmResult<(H520, Address), EthWalletConnectError> {
+ let account =
+ H160::from_str(&account[2..]).map_to_mm(|err| EthWalletConnectError::InternalError(err.to_string()))?;
+ let uncompressed: H520 = {
+ let message_hash = hash_message(message);
+ let signature = Signature::from_str(&signature_str[2..])
+ .map_to_mm(|err| EthWalletConnectError::InvalidSignature(err.to_string()))?;
+ let pubkey = recover(&signature, &message_hash).map_to_mm(|err| {
+ EthWalletConnectError::InvalidSignature(format!(
+ "Couldn't recover public key from the signature: '{signature:?}, error: {err:?}'"
+ ))
+ })?;
+ pubkey.serialize_uncompressed().into()
+ };
+
+ let mut public = Public::default();
+ public.as_mut().copy_from_slice(&uncompressed[1..65]);
+
+ let recovered_address = public_to_address(&public);
+ if account != recovered_address {
+ return MmError::err(EthWalletConnectError::AccountMisMatch(format!(
+ "Recovered address '{recovered_address:?}' should be the same as '{account:?}'"
+ )));
+ }
+
+ Ok((uncompressed, recovered_address))
+}
+
+pub(crate) fn recover(signature: &Signature, message: &Message) -> Result {
+ let recovery_id = {
+ let recovery_id = signature[64]
+ .checked_sub(27)
+ .ok_or_else(|| ethkey::Error::InvalidSignature)?;
+ RecoveryId::from_i32(recovery_id as i32)?
+ };
+ let sig = RecoverableSignature::from_compact(&signature[0..64], recovery_id)?;
+ let pubkey = Secp256k1::new().recover(&secp256k1::Message::from_slice(&message[..])?, &sig)?;
+
+ Ok(pubkey)
+}
+
+/// Sign and send eth transaction with WalletConnect,
+/// This fn is primarily for swap transactions so it uses swap tx fee policy
+pub(crate) async fn send_transaction_with_walletconnect(
+ coin: EthCoin,
+ wc: &WalletConnectCtx,
+ my_address: Address,
+ value: U256,
+ action: Action,
+ data: &[u8],
+ gas: U256,
+) -> Result {
+ info!("target: WalletConnect: sign-and-send, get_gas_price…");
+ // Todo: Tron will have to use ETH protocol for walletconnect, it will be a different coin than the native one in coins config.
+ let chain_id = coin
+ .chain_spec
+ .chain_id()
+ .ok_or(TransactionErr::Plain("Tron is not supported for this action!".into()))?;
+ let pay_for_gas_option = try_tx_s!(
+ coin.get_swap_pay_for_gas_option(coin.get_swap_transaction_fee_policy())
+ .await
+ );
+ let (max_fee_per_gas, max_priority_fee_per_gas) = pay_for_gas_option.get_fee_per_gas();
+ let (nonce, _) = try_tx_s!(coin.clone().get_addr_nonce(my_address).compat().await);
+
+ let params = WcEthTxParams {
+ gas,
+ nonce,
+ data,
+ my_address,
+ action,
+ value,
+ gas_price: pay_for_gas_option.get_gas_price(),
+ chain_id,
+ max_fee_per_gas,
+ max_priority_fee_per_gas,
+ };
+ // Please note that this method may take a long time
+ // due to `eth_sendTransaction` requests.
+ info!("target: WalletConnect: sign-and-send, signing and sending tx");
+ let (signed_tx, _) = try_tx_s!(coin.wc_send_tx(wc, params).await);
+
+ Ok(signed_tx)
+}
diff --git a/mm2src/coins/hd_wallet/coin_ops.rs b/mm2src/coins/hd_wallet/coin_ops.rs
index 27b92d0aa6..7bf6a7392b 100644
--- a/mm2src/coins/hd_wallet/coin_ops.rs
+++ b/mm2src/coins/hd_wallet/coin_ops.rs
@@ -1,7 +1,7 @@
use super::{inner_impl, AccountUpdatingError, AddressDerivingError, DisplayAddress, ExtendedPublicKeyOps,
HDAccountOps, HDCoinExtendedPubkey, HDCoinHDAccount, HDCoinHDAddress, HDConfirmAddress, HDWalletOps,
NewAddressDeriveConfirmError, NewAddressDerivingError};
-use crate::hd_wallet::{HDAddressOps, HDWalletStorageOps, TrezorCoinError};
+use crate::hd_wallet::{errors::SettingEnabledAddressError, HDAddressOps, HDWalletStorageOps, TrezorCoinError};
use async_trait::async_trait;
use bip32::{ChildNumber, DerivationPath};
use crypto::Bip44Chain;
@@ -231,4 +231,14 @@ pub trait HDWalletCoinOps {
/// Returns the Trezor coin name for this coin.
fn trezor_coin(&self) -> MmResult;
+
+ /// Informs the coin of the enabled address provided/derived by the hardware wallet.
+ async fn received_enabled_address_from_hw_wallet(
+ &self,
+ _enabled_address: HDCoinHDAddress,
+ ) -> MmResult<(), SettingEnabledAddressError> {
+ // By default, the default implementation is doing nothing.
+ // Different coins can use this hook to perform additional actions if needed.
+ Ok(())
+ }
}
diff --git a/mm2src/coins/hd_wallet/errors.rs b/mm2src/coins/hd_wallet/errors.rs
index 8b517bc609..89ab2002de 100644
--- a/mm2src/coins/hd_wallet/errors.rs
+++ b/mm2src/coins/hd_wallet/errors.rs
@@ -242,3 +242,8 @@ impl From for NewAddressDeriveConfirmError {
NewAddressDeriveConfirmError::DeriveError(NewAddressDerivingError::Internal(e.to_string()))
}
}
+
+#[derive(Display)]
+pub enum SettingEnabledAddressError {
+ Internal(String),
+}
diff --git a/mm2src/coins/hd_wallet/mod.rs b/mm2src/coins/hd_wallet/mod.rs
index 666293cb60..5691f98c2c 100644
--- a/mm2src/coins/hd_wallet/mod.rs
+++ b/mm2src/coins/hd_wallet/mod.rs
@@ -30,7 +30,7 @@ pub use confirm_address::{HDConfirmAddress, HDConfirmAddressError};
mod errors;
pub use errors::{AccountUpdatingError, AddressDerivingError, HDExtractPubkeyError, HDWithdrawError,
InvalidBip44ChainError, NewAccountCreationError, NewAddressDeriveConfirmError,
- NewAddressDerivingError, TrezorCoinError};
+ NewAddressDerivingError, SettingEnabledAddressError, TrezorCoinError};
mod pubkey;
pub use pubkey::{ExtendedPublicKeyOps, ExtractExtendedPubkey, HDXPubExtractor, RpcTaskXPubExtractor};
@@ -47,7 +47,7 @@ mod wallet_ops;
pub use wallet_ops::HDWalletOps;
mod withdraw_ops;
-pub use withdraw_ops::{HDCoinWithdrawOps, WithdrawFrom, WithdrawSenderAddress};
+pub use withdraw_ops::{HDCoinWithdrawOps, WithdrawSenderAddress};
pub(crate) type HDAccountsMap = BTreeMap;
pub(crate) type HDAccountsMutex = AsyncMutex>;
@@ -485,6 +485,63 @@ impl HDPathAccountToAddressId {
Ok(account_der_path)
}
}
+/// Represents how a hierarchical deterministic (HD) address is selected.
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(untagged)]
+pub enum HDAddressSelector {
+ /// Specifies the HD address using its structured account, chain, and address ID.
+ AddressId(HDPathAccountToAddressId),
+ /// Specifies the HD address directly using a BIP-44,84 and other compliant derivation path.
+ ///
+ /// IMPORTANT: Don't use `Bip44DerivationPath` or `RpcDerivationPath` because if there is an error in the path,
+ /// `serde::Deserialize` returns "data did not match any variant of untagged enum HDAddressSelector".
+ /// It's better to show the user an informative error.
+ DerivationPath { derivation_path: String },
+}
+
+impl HDAddressSelector {
+ pub fn to_address_path(&self, expected_coin_type: u32) -> MmResult {
+ match self {
+ HDAddressSelector::AddressId(address_id) => Ok(*address_id),
+ HDAddressSelector::DerivationPath { derivation_path } => {
+ let derivation_path = StandardHDPath::from_str(derivation_path).map_to_mm(StandardHDPathError::from)?;
+ let coin_type = derivation_path.coin_type();
+
+ if coin_type != expected_coin_type {
+ return MmError::err(StandardHDPathError::InvalidCoinType {
+ expected: expected_coin_type,
+ found: coin_type,
+ });
+ }
+
+ Ok(HDPathAccountToAddressId::from(derivation_path))
+ },
+ }
+ }
+
+ pub fn valid_derivation_path(self, path_to_coin: &HDPathToCoin) -> MmResult {
+ match self {
+ HDAddressSelector::AddressId(id) => id
+ .to_derivation_path(path_to_coin)
+ .mm_err(StandardHDPathError::Bip32Error),
+ HDAddressSelector::DerivationPath { derivation_path } => {
+ let standard_hd_path = StandardHDPath::from_str(&derivation_path)
+ .map_to_mm(|_| StandardHDPathError::Bip32Error(Bip32Error::Decode))?;
+ let rpc_path_to_coin = standard_hd_path.path_to_coin();
+
+ // validate rpc path_to_coin against activated coin.
+ if &rpc_path_to_coin != path_to_coin {
+ return MmError::err(StandardHDPathError::InvalidPathToCoin {
+ expected: rpc_path_to_coin.to_string(),
+ found: path_to_coin.to_string(),
+ });
+ };
+
+ Ok(standard_hd_path.to_derivation_path())
+ },
+ }
+ }
+}
pub(crate) mod inner_impl {
use super::*;
diff --git a/mm2src/coins/hd_wallet/pubkey.rs b/mm2src/coins/hd_wallet/pubkey.rs
index 7babb12bd5..64b24e2abd 100644
--- a/mm2src/coins/hd_wallet/pubkey.rs
+++ b/mm2src/coins/hd_wallet/pubkey.rs
@@ -130,7 +130,7 @@ where
let trezor_message_type = match coin_protocol {
CoinProtocol::UTXO => TrezorMessageType::Bitcoin,
CoinProtocol::QTUM => TrezorMessageType::Bitcoin,
- CoinProtocol::ETH | CoinProtocol::ERC20 { .. } => TrezorMessageType::Ethereum,
+ CoinProtocol::ETH { .. } | CoinProtocol::ERC20 { .. } => TrezorMessageType::Ethereum,
_ => return Err(MmError::new(HDExtractPubkeyError::CoinDoesntSupportTrezor)),
};
Ok(RpcTaskXPubExtractor::Trezor {
diff --git a/mm2src/coins/hd_wallet/withdraw_ops.rs b/mm2src/coins/hd_wallet/withdraw_ops.rs
index 5b7ddf48cf..3b3d6ac7d9 100644
--- a/mm2src/coins/hd_wallet/withdraw_ops.rs
+++ b/mm2src/coins/hd_wallet/withdraw_ops.rs
@@ -1,51 +1,12 @@
use super::{DisplayAddress, HDPathAccountToAddressId, HDWalletOps, HDWithdrawError};
-use crate::hd_wallet::{HDAccountOps, HDAddressOps, HDCoinAddress, HDWalletCoinOps};
+use crate::hd_wallet::{HDAccountOps, HDAddressOps, HDAddressSelector, HDCoinAddress, HDWalletCoinOps};
use async_trait::async_trait;
use bip32::DerivationPath;
-use crypto::{StandardHDPath, StandardHDPathError};
use mm2_err_handle::prelude::*;
-use std::str::FromStr;
type HDCoinPubKey =
<<<::HDWallet as HDWalletOps>::HDAccount as HDAccountOps>::HDAddress as HDAddressOps>::Pubkey;
-/// Represents the source of the funds for a withdrawal operation.
-#[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(untagged)]
-pub enum WithdrawFrom {
- /// The address id of the sender address which is specified by the account id, chain, and address id.
- AddressId(HDPathAccountToAddressId),
- /// The derivation path of the sender address in the BIP-44 format.
- ///
- /// IMPORTANT: Don't use `Bip44DerivationPath` or `RpcDerivationPath` because if there is an error in the path,
- /// `serde::Deserialize` returns "data did not match any variant of untagged enum WithdrawFrom".
- /// It's better to show the user an informative error.
- DerivationPath { derivation_path: String },
-}
-
-impl WithdrawFrom {
- #[allow(clippy::result_large_err)]
- pub fn to_address_path(&self, expected_coin_type: u32) -> MmResult {
- match self {
- WithdrawFrom::AddressId(address_id) => Ok(*address_id),
- WithdrawFrom::DerivationPath { derivation_path } => {
- let derivation_path = StandardHDPath::from_str(derivation_path)
- .map_to_mm(StandardHDPathError::from)
- .mm_err(|e| HDWithdrawError::UnexpectedFromAddress(e.to_string()))?;
- let coin_type = derivation_path.coin_type();
- if coin_type != expected_coin_type {
- let error = format!(
- "Derivation path '{}' must have '{}' coin type",
- derivation_path, expected_coin_type
- );
- return MmError::err(HDWithdrawError::UnexpectedFromAddress(error));
- }
- Ok(HDPathAccountToAddressId::from(derivation_path))
- },
- }
- }
-}
-
/// Contains the details of the sender address for a withdraw operation.
pub struct WithdrawSenderAddress {
pub(crate) address: Address,
@@ -61,13 +22,15 @@ pub trait HDCoinWithdrawOps: HDWalletCoinOps {
async fn get_withdraw_hd_sender(
&self,
hd_wallet: &Self::HDWallet,
- from: &WithdrawFrom,
+ from: &HDAddressSelector,
) -> MmResult, HDCoinPubKey>, HDWithdrawError> {
let HDPathAccountToAddressId {
account_id,
chain,
address_id,
- } = from.to_address_path(hd_wallet.coin_type())?;
+ } = from
+ .to_address_path(hd_wallet.coin_type())
+ .mm_err(|err| HDWithdrawError::UnexpectedFromAddress(err.to_string()))?;
let hd_account = hd_wallet
.get_account(account_id)
diff --git a/mm2src/coins/lightning.rs b/mm2src/coins/lightning.rs
index 949c39a857..d9c48ecbf3 100644
--- a/mm2src/coins/lightning.rs
+++ b/mm2src/coins/lightning.rs
@@ -10,7 +10,8 @@ mod ln_sql;
pub mod ln_storage;
pub mod ln_utils;
-use crate::coin_errors::{MyAddressError, ValidatePaymentResult};
+use crate::coin_errors::{AddressFromPubkeyError, MyAddressError, ValidatePaymentResult};
+use crate::hd_wallet::HDAddressSelector;
use crate::lightning::ln_utils::{filter_channels, pay_invoice_with_max_total_cltv_expiry_delta, PaymentError};
use crate::utxo::rpc_clients::UtxoRpcClientEnum;
use crate::utxo::utxo_common::{big_decimal_from_sat, big_decimal_from_sat_unsigned};
@@ -65,7 +66,7 @@ use mm2_err_handle::prelude::*;
use mm2_net::ip_addr::myipaddr;
use mm2_number::{BigDecimal, MmNumber};
use parking_lot::Mutex as PaMutex;
-use rpc::v1::types::{Bytes as BytesJson, H256 as H256Json};
+use rpc::v1::types::{Bytes as BytesJson, H256 as H256Json, H264 as H264Json};
use script::TransactionInputSigner;
use secp256k1v24::PublicKey;
use serde::Deserialize;
@@ -942,6 +943,12 @@ impl MarketCoinOps for LightningCoin {
fn my_address(&self) -> MmResult { Ok(self.my_node_id()) }
+ fn address_from_pubkey(&self, pubkey: &H264Json) -> MmResult {
+ PublicKey::from_slice(&pubkey.0)
+ .map(|pubkey| pubkey.to_string())
+ .map_to_mm(|e| AddressFromPubkeyError::InternalError(format!("Couldn't parse bytes into secp pubkey: {e}")))
+ }
+
async fn get_public_key(&self) -> Result> { Ok(self.my_node_id()) }
fn sign_message_hash(&self, message: &str) -> Option<[u8; 32]> {
@@ -950,7 +957,12 @@ impl MarketCoinOps for LightningCoin {
Some(dhash256(prefixed_message.as_bytes()).take())
}
- fn sign_message(&self, message: &str) -> SignatureResult {
+ fn sign_message(&self, message: &str, address: Option) -> SignatureResult {
+ if address.is_some() {
+ return MmError::err(SignatureError::InvalidRequest(
+ "functionality not supported for Lightning yet.".into(),
+ ));
+ }
let message_hash = self.sign_message_hash(message).ok_or(SignatureError::PrefixNotFound)?;
let secret_key = self
.keys_manager
diff --git a/mm2src/coins/lightning/ln_platform.rs b/mm2src/coins/lightning/ln_platform.rs
index e7d57cb217..0d289aa8d0 100644
--- a/mm2src/coins/lightning/ln_platform.rs
+++ b/mm2src/coins/lightning/ln_platform.rs
@@ -568,7 +568,7 @@ impl FeeEstimator for Platform {
ConfirmationTarget::Normal => self.confirmations_targets.normal,
ConfirmationTarget::HighPriority => self.confirmations_targets.high_priority,
};
- let fee_per_kb = tokio::task::block_in_place(move || {
+ let fee_rate = tokio::task::block_in_place(move || {
block_on_f01(self.rpc_client().estimate_fee_sat(
platform_coin.decimals(),
// Todo: when implementing Native client detect_fee_method should be used for Native and
@@ -582,16 +582,16 @@ impl FeeEstimator for Platform {
// Set default fee to last known fee for the corresponding confirmation target
match confirmation_target {
- ConfirmationTarget::Background => self.latest_fees.set_background_fees(fee_per_kb),
- ConfirmationTarget::Normal => self.latest_fees.set_normal_fees(fee_per_kb),
- ConfirmationTarget::HighPriority => self.latest_fees.set_high_priority_fees(fee_per_kb),
+ ConfirmationTarget::Background => self.latest_fees.set_background_fees(fee_rate),
+ ConfirmationTarget::Normal => self.latest_fees.set_normal_fees(fee_rate),
+ ConfirmationTarget::HighPriority => self.latest_fees.set_high_priority_fees(fee_rate),
};
// Must be no smaller than 253 (ie 1 satoshi-per-byte rounded up to ensure later round-downs don’t put us below 1 satoshi-per-byte).
// https://docs.rs/lightning/0.0.101/lightning/chain/chaininterface/trait.FeeEstimator.html#tymethod.get_est_sat_per_1000_weight
// This has changed in rust-lightning v0.0.110 as LDK currently wraps get_est_sat_per_1000_weight to ensure that the value returned is
// no smaller than 253. https://github.com/lightningdevkit/rust-lightning/pull/1552
- (fee_per_kb as f64 / 4.0).ceil() as u32
+ (fee_rate as f64 / 4.0).ceil() as u32
}
}
diff --git a/mm2src/coins/lightning/ln_utils.rs b/mm2src/coins/lightning/ln_utils.rs
index 79868908fa..68f3c7f7ab 100644
--- a/mm2src/coins/lightning/ln_utils.rs
+++ b/mm2src/coins/lightning/ln_utils.rs
@@ -22,7 +22,7 @@ use mm2_core::mm_ctx::MmArc;
use std::collections::hash_map::Entry;
use std::fs::File;
use std::path::PathBuf;
-use std::sync::Arc;
+use std::sync::{Arc, Mutex};
pub const PAYMENT_RETRY_ATTEMPTS: usize = 5;
@@ -54,13 +54,15 @@ impl From for RpcBestBlock {
}
#[inline]
-fn ln_data_dir(ctx: &MmArc, ticker: &str) -> PathBuf { ctx.dbdir().join("LIGHTNING").join(ticker) }
+fn ln_data_dir(ctx: &MmArc, platform_coin_address: &str, ticker: &str) -> PathBuf {
+ ctx.address_dir(platform_coin_address).join("LIGHTNING").join(ticker)
+}
#[inline]
-fn ln_data_backup_dir(ctx: &MmArc, path: Option, ticker: &str) -> Option {
+fn ln_data_backup_dir(path: Option, platform_coin_address: &str, ticker: &str) -> Option {
path.map(|p| {
PathBuf::from(&p)
- .join(hex::encode(ctx.rmd160().as_slice()))
+ .join(platform_coin_address)
.join("LIGHTNING")
.join(ticker)
})
@@ -68,11 +70,12 @@ fn ln_data_backup_dir(ctx: &MmArc, path: Option, ticker: &str) -> Option
pub async fn init_persister(
ctx: &MmArc,
+ platform_coin_address: &str,
ticker: String,
backup_path: Option,
) -> EnableLightningResult> {
- let ln_data_dir = ln_data_dir(ctx, &ticker);
- let ln_data_backup_dir = ln_data_backup_dir(ctx, backup_path, &ticker);
+ let ln_data_dir = ln_data_dir(ctx, platform_coin_address, &ticker);
+ let ln_data_backup_dir = ln_data_backup_dir(backup_path, platform_coin_address, &ticker);
let persister = Arc::new(LightningFilesystemPersister::new(ln_data_dir, ln_data_backup_dir));
let is_initialized = persister.is_fs_initialized().await?;
@@ -83,16 +86,15 @@ pub async fn init_persister(
Ok(persister)
}
-pub async fn init_db(ctx: &MmArc, ticker: String) -> EnableLightningResult {
- let db = SqliteLightningDB::new(
- ticker,
- ctx.sqlite_connection
- .get()
- .ok_or(MmError::new(EnableLightningError::DbError(
- "sqlite_connection is not initialized".into(),
- )))?
- .clone(),
- )?;
+pub async fn init_db(
+ ctx: &MmArc,
+ platform_coin_address: &str,
+ ticker: String,
+) -> EnableLightningResult {
+ let conn = ctx
+ .address_db(platform_coin_address)
+ .map_err(|e| EnableLightningError::IOError(e.to_string()))?;
+ let db = SqliteLightningDB::new(ticker, Arc::new(Mutex::new(conn)))?;
if !db.is_db_initialized().await? {
db.init_db().await?;
diff --git a/mm2src/coins/lp_coins.rs b/mm2src/coins/lp_coins.rs
index 4de2ab31fc..c0414335f5 100644
--- a/mm2src/coins/lp_coins.rs
+++ b/mm2src/coins/lp_coins.rs
@@ -43,7 +43,6 @@
#[macro_use] extern crate ser_error_derive;
use async_trait::async_trait;
-use base58::FromBase58Error;
use bip32::ExtendedPrivateKey;
use common::custom_futures::timeout::TimeoutError;
use common::executor::{abortable_queue::WeakSpawner, AbortedError, SpawnFuture};
@@ -54,7 +53,7 @@ use crypto::{derive_secp256k1_secret, Bip32Error, Bip44Chain, CryptoCtx, CryptoC
Secp256k1ExtendedPublicKey, Secp256k1Secret, WithHwRpcError};
use derive_more::Display;
use enum_derives::{EnumFromStringify, EnumFromTrait};
-use ethereum_types::{H256, U256};
+use ethereum_types::{H256, H264, H520, U256};
use futures::compat::Future01CompatExt;
use futures::lock::{Mutex as AsyncMutex, MutexGuard as AsyncMutexGuard};
use futures::{FutureExt, TryFutureExt};
@@ -72,7 +71,8 @@ use mm2_rpc::data::legacy::{EnabledCoin, GetEnabledResponse, Mm2RpcResult};
#[cfg(any(test, feature = "for-tests"))]
use mocktopus::macros::*;
use parking_lot::Mutex as PaMutex;
-use rpc::v1::types::{Bytes as BytesJson, H256 as H256Json};
+use rpc::v1::types::{Bytes as BytesJson, H256 as H256Json, H264 as H264Json};
+use rpc_command::tendermint::ibc::ChannelId;
use serde::{Deserialize, Deserializer, Serialize, Serializer};
use serde_json::{self as json, Value as Json};
use std::array::TryFromSliceError;
@@ -102,7 +102,7 @@ cfg_native! {
}
cfg_wasm32! {
- use ethereum_types::{H264 as EthH264, H520 as EthH520};
+ use ethereum_types::{H264 as EthH264};
use hd_wallet::HDWalletDb;
use mm2_db::indexed_db::{ConstructibleDb, DbLocked, SharedDb};
use tx_history_storage::wasm::{clear_tx_history, load_tx_history, save_tx_history, TxHistoryDb};
@@ -214,13 +214,10 @@ pub mod lp_price;
pub mod watcher_common;
pub mod coin_errors;
-use coin_errors::{MyAddressError, ValidatePaymentError, ValidatePaymentFut, ValidatePaymentResult};
+use coin_errors::{AddressFromPubkeyError, MyAddressError, ValidatePaymentError, ValidatePaymentFut,
+ ValidatePaymentResult};
use crypto::secret_hash_algo::SecretHashAlgo;
-#[doc(hidden)]
-#[cfg(test)]
-pub mod coins_tests;
-
pub mod eth;
use eth::erc20::get_erc20_ticker_by_contract_address;
use eth::eth_swap_v2::{PrepareTxDataError, ValidatePaymentV2Err};
@@ -228,9 +225,9 @@ use eth::{eth_coin_from_conf_and_request, get_eth_address, EthCoin, EthGasDetail
GetEthAddressError, GetValidEthWithdrawAddError, SignedEthTx};
pub mod hd_wallet;
-use hd_wallet::{AccountUpdatingError, AddressDerivingError, HDAccountOps, HDAddressId, HDAddressOps, HDCoinAddress,
- HDCoinHDAccount, HDExtractPubkeyError, HDPathAccountToAddressId, HDWalletAddress, HDWalletCoinOps,
- HDWalletOps, HDWithdrawError, HDXPubExtractor, WithdrawFrom, WithdrawSenderAddress};
+use hd_wallet::{AccountUpdatingError, AddressDerivingError, HDAccountOps, HDAddressId, HDAddressOps,
+ HDAddressSelector, HDCoinAddress, HDCoinHDAccount, HDExtractPubkeyError, HDPathAccountToAddressId,
+ HDWalletAddress, HDWalletCoinOps, HDWalletOps, HDWithdrawError, HDXPubExtractor, WithdrawSenderAddress};
#[cfg(not(target_arch = "wasm32"))] pub mod lightning;
#[cfg_attr(target_arch = "wasm32", allow(dead_code, unused_imports))]
@@ -2080,11 +2077,13 @@ pub trait MarketCoinOps {
fn my_address(&self) -> MmResult;
+ fn address_from_pubkey(&self, pubkey: &H264Json) -> MmResult;
+
async fn get_public_key(&self) -> Result>;
fn sign_message_hash(&self, _message: &str) -> Option<[u8; 32]>;
- fn sign_message(&self, _message: &str) -> SignatureResult;
+ fn sign_message(&self, _message: &str, _address: Option) -> SignatureResult;
fn verify_message(&self, _signature: &str, _message: &str, _address: &str) -> VerificationResult;
@@ -2143,8 +2142,8 @@ pub trait MarketCoinOps {
/// Is privacy coin like zcash or pirate
fn is_privacy(&self) -> bool { false }
- /// Is KMD coin
- fn is_kmd(&self) -> bool { false }
+ /// Returns `true` for coins (like KMD) that should use direct DEX fee burning via OP_RETURN.
+ fn should_burn_directly(&self) -> bool { false }
/// Should burn part of dex fee coin
fn should_burn_dex_fee(&self) -> bool;
@@ -2211,7 +2210,7 @@ pub trait GetWithdrawSenderAddress {
#[derive(Clone, Default, Deserialize)]
pub struct WithdrawRequest {
coin: String,
- from: Option,
+ from: Option,
to: String,
#[serde(default)]
amount: BigDecimal,
@@ -2220,9 +2219,8 @@ pub struct WithdrawRequest {
fee: Option,
memo: Option,
/// Tendermint specific field used for manually providing the IBC channel IDs.
- ibc_source_channel: Option,
- /// Currently, this flag is used by ETH/ERC20 coins activated with MetaMask **only**.
- #[cfg(target_arch = "wasm32")]
+ ibc_source_channel: Option,
+ /// Currently, this flag is used by ETH/ERC20 coins activated with MetaMask/WalletConnect(Some wallets e.g Metamask) **only**.
#[serde(default)]
broadcast: bool,
}
@@ -2295,10 +2293,11 @@ pub enum ValidatorsInfoDetails {
Cosmos(rpc_command::tendermint::staking::ValidatorsQuery),
}
-#[derive(Serialize, Deserialize)]
+#[derive(Deserialize)]
pub struct SignatureRequest {
coin: String,
message: String,
+ address: Option,
}
#[derive(Serialize, Deserialize)]
@@ -3179,15 +3178,10 @@ pub enum WithdrawError {
},
#[display(fmt = "Signing error {}", _0)]
SigningError(String),
- #[display(fmt = "Eth transaction type not supported")]
+ #[display(fmt = "Transaction type not supported")]
TxTypeNotSupported,
- #[display(fmt = "'chain_registry_name' was not found in coins configuration for '{}'", _0)]
- RegistryNameIsMissing(String),
- #[display(
- fmt = "IBC channel could not found for '{}' address. Consider providing it manually with 'ibc_source_channel' in the request.",
- _0
- )]
- IBCChannelCouldNotFound(String),
+ #[display(fmt = "Tendermint IBC error: {}", _0)]
+ IBCError(tendermint::IBCError),
}
impl HttpStatusCode for WithdrawError {
@@ -3216,8 +3210,7 @@ impl HttpStatusCode for WithdrawError {
| WithdrawError::NoChainIdSet { .. }
| WithdrawError::TxTypeNotSupported
| WithdrawError::SigningError(_)
- | WithdrawError::RegistryNameIsMissing(_)
- | WithdrawError::IBCChannelCouldNotFound(_)
+ | WithdrawError::IBCError(_)
| WithdrawError::MyAddressNotNftOwner { .. } => StatusCode::BAD_REQUEST,
WithdrawError::HwError(_) => StatusCode::GONE,
#[cfg(target_arch = "wasm32")]
@@ -3414,17 +3407,14 @@ impl HttpStatusCode for VerificationError {
}
}
-impl From for VerificationError {
- fn from(e: FromBase58Error) -> Self {
- match e {
- FromBase58Error::InvalidBase58Character(c, _) => {
- VerificationError::AddressDecodingError(format!("Invalid Base58 Character: {}", c))
- },
- FromBase58Error::InvalidBase58Length => {
- VerificationError::AddressDecodingError(String::from("Invalid Base58 Length"))
- },
- }
- }
+#[derive(Clone, Debug, Deserialize, Display, PartialEq, Serialize)]
+pub enum OrderCreationPreCheckError {
+ #[display(fmt = "'{ticker}' is a wallet only asset and can't be used in orders.")]
+ IsWalletOnly { ticker: String },
+ #[display(fmt = "Pre-Check failed due to this reason: {reason}")]
+ PreCheckFailed { reason: String },
+ #[display(fmt = "Internal error: {reason}")]
+ InternalError { reason: String },
}
/// NB: Implementations are expected to follow the pImpl idiom, providing cheap reference-counted cloning and garbage collection.
@@ -3538,6 +3528,31 @@ pub trait MmCoin: SwapOps + WatcherOps + MarketCoinOps + Send + Sync + 'static {
stage: FeeApproxStage,
) -> TradePreimageResult;
+ /// TODO: It's weird that we implement this function on this trait.
+ ///
+ /// Move this into the `SwapOps` trait when possible (this function requires `MmCoins`
+ /// trait to be implemented, but it's currently not possible to do `SwapOps: MmCoins`
+ /// as `MmCoins` is already `MmCoins: SwapOps`.
+ async fn pre_check_for_order_creation(
+ &self,
+ ctx: &MmArc,
+ rel_coin: &MmCoinEnum,
+ ) -> MmResult<(), OrderCreationPreCheckError> {
+ if self.wallet_only(ctx) {
+ return MmError::err(OrderCreationPreCheckError::IsWalletOnly {
+ ticker: self.ticker().to_owned(),
+ });
+ }
+
+ if rel_coin.wallet_only(ctx) {
+ return MmError::err(OrderCreationPreCheckError::IsWalletOnly {
+ ticker: rel_coin.ticker().to_owned(),
+ });
+ }
+
+ Ok(())
+ }
+
/// required transaction confirmations number to ensure double-spend safety
fn required_confirmations(&self) -> u64;
@@ -3826,7 +3841,7 @@ impl DexFee {
let dex_fee = trade_amount * &rate;
let min_tx_amount = MmNumber::from(taker_coin.min_tx_amount());
- if taker_coin.is_kmd() {
+ if taker_coin.should_burn_directly() {
// use a special dex fee option for kmd
return Self::calc_dex_fee_for_op_return(dex_fee, min_tx_amount);
}
@@ -4194,13 +4209,26 @@ pub enum PrivKeyPolicy {
/// with the Metamask extension, especially within web-based contexts.
#[cfg(target_arch = "wasm32")]
Metamask(EthMetamaskPolicy),
+ /// WalletConnect private key policy.
+ ///
+ /// This variant represents the key management details for connections
+ /// established via WalletConnect. It includes both compressed and uncompressed
+ /// public keys.
+ /// - `public_key`: Compressed public key, represented as [H264].
+ /// - `public_key_uncompressed`: Uncompressed public key, represented as [H520].
+ /// - `session_topic`: WalletConnect session that was used to activate this coin.
+ WalletConnect {
+ public_key: H264,
+ public_key_uncompressed: H520,
+ session_topic: String,
+ },
}
#[cfg(target_arch = "wasm32")]
#[derive(Clone, Debug)]
pub struct EthMetamaskPolicy {
pub(crate) public_key: EthH264,
- pub(crate) public_key_uncompressed: EthH520,
+ pub(crate) public_key_uncompressed: H520,
}
impl From for PrivKeyPolicy {
@@ -4215,7 +4243,7 @@ impl PrivKeyPolicy {
activated_key: activated_key_pair,
..
} => Some(activated_key_pair),
- PrivKeyPolicy::Trezor => None,
+ PrivKeyPolicy::WalletConnect { .. } | PrivKeyPolicy::Trezor => None,
#[cfg(target_arch = "wasm32")]
PrivKeyPolicy::Metamask(_) => None,
}
@@ -4235,7 +4263,7 @@ impl PrivKeyPolicy {
PrivKeyPolicy::HDWallet {
bip39_secp_priv_key, ..
} => Some(bip39_secp_priv_key),
- PrivKeyPolicy::Iguana(_) | PrivKeyPolicy::Trezor => None,
+ PrivKeyPolicy::Iguana(_) | PrivKeyPolicy::Trezor | PrivKeyPolicy::WalletConnect { .. } => None,
#[cfg(target_arch = "wasm32")]
PrivKeyPolicy::Metamask(_) => None,
}
@@ -4257,8 +4285,7 @@ impl PrivKeyPolicy {
path_to_coin: derivation_path,
..
} => Some(derivation_path),
- PrivKeyPolicy::Trezor => None,
- PrivKeyPolicy::Iguana(_) => None,
+ PrivKeyPolicy::Iguana(_) | PrivKeyPolicy::Trezor | PrivKeyPolicy::WalletConnect { .. } => None,
#[cfg(target_arch = "wasm32")]
PrivKeyPolicy::Metamask(_) => None,
}
@@ -4515,11 +4542,19 @@ pub enum CoinProtocol {
platform: String,
contract_address: String,
},
- ETH,
+ // Todo: Document this
+ /// # Breaking Changes
+ ETH {
+ chain_id: u64,
+ },
ERC20 {
platform: String,
contract_address: String,
},
+ TRX {
+ network: eth::tron::Network,
+ },
+ // Todo: Add TRC20, Do we need to support TRC10?
SLPTOKEN {
platform: String,
token_id: H256Json,
@@ -4578,7 +4613,8 @@ impl CoinProtocol {
CoinProtocol::LIGHTNING { platform, .. } => Some(platform),
CoinProtocol::UTXO
| CoinProtocol::QTUM
- | CoinProtocol::ETH
+ | CoinProtocol::ETH { .. }
+ | CoinProtocol::TRX { .. }
| CoinProtocol::BCH { .. }
| CoinProtocol::TENDERMINT(_)
| CoinProtocol::ZHTLC(_) => None,
@@ -4596,7 +4632,8 @@ impl CoinProtocol {
CoinProtocol::SLPTOKEN { .. }
| CoinProtocol::UTXO
| CoinProtocol::QTUM
- | CoinProtocol::ETH
+ | CoinProtocol::ETH { .. }
+ | CoinProtocol::TRX { .. }
| CoinProtocol::BCH { .. }
| CoinProtocol::TENDERMINT(_)
| CoinProtocol::TENDERMINTTOKEN(_)
@@ -4859,7 +4896,7 @@ pub async fn lp_coininit(ctx: &MmArc, ticker: &str, req: &Json) -> Result {
+ CoinProtocol::ETH { .. } | CoinProtocol::ERC20 { .. } => {
try_s!(eth_coin_from_conf_and_request(ctx, ticker, &coins_en, req, protocol, priv_key_policy).await).into()
},
CoinProtocol::QRC20 {
@@ -4917,6 +4954,7 @@ pub async fn lp_coininit(ctx: &MmArc, ticker: &str, req: &Json) -> Result return ERR!("TENDERMINTTOKEN protocol is not supported by lp_coininit"),
CoinProtocol::ZHTLC { .. } => return ERR!("ZHTLC protocol is not supported by lp_coininit"),
CoinProtocol::NFT { .. } => return ERR!("NFT protocol is not supported by lp_coininit"),
+ CoinProtocol::TRX { .. } => return ERR!("TRX protocol is not supported by lp_coininit"),
#[cfg(not(target_arch = "wasm32"))]
CoinProtocol::LIGHTNING { .. } => return ERR!("Lightning protocol is not supported by lp_coininit"),
#[cfg(feature = "enable-sia")]
@@ -5112,8 +5150,14 @@ pub async fn get_raw_transaction(ctx: MmArc, req: RawTransactionRequest) -> RawT
}
pub async fn sign_message(ctx: MmArc, req: SignatureRequest) -> SignatureResult {
+ if req.address.is_some() && !ctx.enable_hd() {
+ return MmError::err(SignatureError::InvalidRequest(
+ "You need to enable kdf with enable_hd to sign messages with a specific account/address".to_string(),
+ ));
+ };
let coin = lp_coinfind_or_err(&ctx, &req.coin).await?;
- let signature = coin.sign_message(&req.message)?;
+ let signature = coin.sign_message(&req.message, req.address)?;
+
Ok(SignatureResponse { signature })
}
@@ -5474,47 +5518,6 @@ pub async fn register_balance_update_handler(
coins_ctx.balance_update_handlers.lock().await.push(handler);
}
-pub fn update_coins_config(mut config: Json) -> Result {
- let coins = match config.as_array_mut() {
- Some(c) => c,
- _ => return ERR!("Coins config must be an array"),
- };
-
- for coin in coins {
- // the coin_as_str is used only to be formatted
- let coin_as_str = format!("{}", coin);
- let coin = try_s!(coin
- .as_object_mut()
- .ok_or(ERRL!("Expected object, found {:?}", coin_as_str)));
- if coin.contains_key("protocol") {
- // the coin is up-to-date
- continue;
- }
- let protocol = match coin.remove("etomic") {
- Some(etomic) => {
- let etomic = etomic
- .as_str()
- .ok_or(ERRL!("Expected etomic as string, found {:?}", etomic))?;
- if etomic == "0x0000000000000000000000000000000000000000" {
- CoinProtocol::ETH
- } else {
- let contract_address = etomic.to_owned();
- CoinProtocol::ERC20 {
- platform: "ETH".into(),
- contract_address,
- }
- }
- },
- _ => CoinProtocol::UTXO,
- };
-
- let protocol = json::to_value(protocol).map_err(|e| ERRL!("Error {:?} on process {:?}", e, coin_as_str))?;
- coin.insert("protocol".into(), protocol);
- }
-
- Ok(config)
-}
-
#[derive(Deserialize)]
struct ConvertUtxoAddressReq {
address: String,
@@ -5550,7 +5553,11 @@ pub fn address_by_coin_conf_and_pubkey_str(
) -> Result {
let protocol: CoinProtocol = try_s!(json::from_value(conf["protocol"].clone()));
match protocol {
- CoinProtocol::ERC20 { .. } | CoinProtocol::ETH | CoinProtocol::NFT { .. } => eth::addr_from_pubkey_str(pubkey),
+ CoinProtocol::ERC20 { .. } | CoinProtocol::ETH { .. } | CoinProtocol::NFT { .. } => {
+ eth::addr_from_pubkey_str(pubkey)
+ },
+ // Todo: implement TRX address generation
+ CoinProtocol::TRX { .. } => ERR!("TRX address generation is not implemented yet"),
CoinProtocol::UTXO | CoinProtocol::QTUM | CoinProtocol::QRC20 { .. } | CoinProtocol::BCH { .. } => {
utxo::address_by_conf_and_pubkey_str(coin, conf, pubkey, addr_format)
},
@@ -5828,7 +5835,7 @@ pub async fn get_my_address(ctx: MmArc, req: MyAddressReq) -> MmResult get_eth_address(&ctx, &conf, ticker, &req.path_to_address).await?,
+ CoinProtocol::ETH { .. } => get_eth_address(&ctx, &conf, ticker, &req.path_to_address).await?,
_ => {
return MmError::err(GetMyAddressError::CoinIsNotSupported(format!(
"{} doesn't support get_my_address",
@@ -6184,7 +6191,7 @@ mod tests {
pub mod for_tests {
use crate::rpc_command::init_withdraw::WithdrawStatusRequest;
use crate::rpc_command::init_withdraw::{init_withdraw, withdraw_status};
- use crate::{TransactionDetails, WithdrawError, WithdrawFee, WithdrawFrom, WithdrawRequest};
+ use crate::{HDAddressSelector, TransactionDetails, WithdrawError, WithdrawFee, WithdrawRequest};
use common::executor::Timer;
use common::{now_ms, wait_until_ms};
use mm2_core::mm_ctx::MmArc;
@@ -6206,7 +6213,7 @@ pub mod for_tests {
client_id: 0,
inner: WithdrawRequest {
amount: BigDecimal::from_str(amount).unwrap(),
- from: from_derivation_path.map(|from_derivation_path| WithdrawFrom::DerivationPath {
+ from: from_derivation_path.map(|from_derivation_path| HDAddressSelector::DerivationPath {
derivation_path: from_derivation_path.to_owned(),
}),
to: to.to_owned(),
diff --git a/mm2src/coins/my_tx_history_v2.rs b/mm2src/coins/my_tx_history_v2.rs
index d35de25ddc..9bd5877ff5 100644
--- a/mm2src/coins/my_tx_history_v2.rs
+++ b/mm2src/coins/my_tx_history_v2.rs
@@ -187,6 +187,9 @@ impl<'a, Addr: Clone + DisplayAddress + Eq + std::hash::Hash, Tx: Transaction> T
self.from_addresses.insert(address);
}
+ /// TODO: This implementation is messy. We should do all the calculations before storing them
+ /// to the database. We shouldn’t need these on-demand calculations in this module; it's better
+ /// to remove this function entirely but some coins like UTXOs still depend on it.
pub fn build(self) -> TransactionDetails {
let (block_height, timestamp) = match self.block_height_and_time {
Some(height_with_time) => (height_with_time.height, height_with_time.timestamp),
@@ -210,15 +213,8 @@ impl<'a, Addr: Clone + DisplayAddress + Eq + std::hash::Hash, Tx: Transaction> T
bytes_for_hash.extend_from_slice(&token_id.0);
sha256(&bytes_for_hash).to_vec().into()
},
- TransactionType::TendermintIBCTransfer { token_id }
- | TransactionType::CustomTendermintMsg { token_id, .. } => {
- if let Some(token_id) = token_id {
- let mut bytes_for_hash = tx_hash.0.clone();
- bytes_for_hash.extend_from_slice(&token_id.0);
- sha256(&bytes_for_hash).to_vec().into()
- } else {
- tx_hash.clone()
- }
+ TransactionType::TendermintIBCTransfer { .. } | TransactionType::CustomTendermintMsg { .. } => {
+ unreachable!("Tendermint never invokes this function.")
},
TransactionType::StakingDelegation
| TransactionType::RemoveDelegation
diff --git a/mm2src/coins/qrc20.rs b/mm2src/coins/qrc20.rs
index 3049a56ec2..3d6f8660b3 100644
--- a/mm2src/coins/qrc20.rs
+++ b/mm2src/coins/qrc20.rs
@@ -1,5 +1,6 @@
-use crate::coin_errors::{MyAddressError, ValidatePaymentError, ValidatePaymentResult};
+use crate::coin_errors::{AddressFromPubkeyError, MyAddressError, ValidatePaymentError, ValidatePaymentResult};
use crate::eth::{self, u256_to_big_decimal, wei_from_big_decimal, TryToAddress};
+use crate::hd_wallet::HDAddressSelector;
use crate::qrc20::rpc_clients::{LogEntry, Qrc20ElectrumOps, Qrc20NativeOps, Qrc20RpcOps, TopicFilter, TxReceipt,
ViewContractCallType};
use crate::utxo::qtum::QtumBasedCoin;
@@ -11,11 +12,10 @@ use crate::utxo::utxo_builder::{UtxoCoinBuildError, UtxoCoinBuildResult, UtxoCoi
UtxoFieldsWithGlobalHDBuilder, UtxoFieldsWithHardwareWalletBuilder,
UtxoFieldsWithIguanaSecretBuilder};
use crate::utxo::utxo_common::{self, big_decimal_from_sat, check_all_utxo_inputs_signed_by_pub, UtxoTxBuilder};
-use crate::utxo::{qtum, ActualTxFee, AdditionalTxData, AddrFromStrError, BroadcastTxErr, FeePolicy, GenerateTxError,
- GetUtxoListOps, HistoryUtxoTx, HistoryUtxoTxMap, MatureUnspentList, RecentlySpentOutPointsGuard,
- UnsupportedAddr, UtxoActivationParams, UtxoAddressFormat, UtxoCoinFields, UtxoCommonOps,
- UtxoFromLegacyReqErr, UtxoTx, UtxoTxBroadcastOps, UtxoTxGenerationOps, VerboseTransactionFrom,
- UTXO_LOCK};
+use crate::utxo::{qtum, ActualFeeRate, AddrFromStrError, BroadcastTxErr, FeePolicy, GenerateTxError, GetUtxoListOps,
+ HistoryUtxoTx, HistoryUtxoTxMap, MatureUnspentList, RecentlySpentOutPointsGuard, UnsupportedAddr,
+ UtxoActivationParams, UtxoAddressFormat, UtxoCoinFields, UtxoCommonOps, UtxoFromLegacyReqErr,
+ UtxoTx, UtxoTxBroadcastOps, UtxoTxGenerationOps, VerboseTransactionFrom, UTXO_LOCK};
use crate::{BalanceError, BalanceFut, CheckIfMyPaymentSentArgs, CoinBalance, ConfirmPaymentInput, DexFee, Eip1559Ops,
FeeApproxStage, FoundSwapTxSpend, HistorySyncState, IguanaPrivKey, MarketCoinOps, MmCoin,
NegotiateSwapContractAddrErr, PrivKeyBuildPolicy, PrivKeyPolicyNotAllowed, RawTransactionFut,
@@ -45,7 +45,8 @@ use mm2_core::mm_ctx::MmArc;
use mm2_err_handle::prelude::*;
use mm2_number::{BigDecimal, MmNumber};
#[cfg(test)] use mocktopus::macros::*;
-use rpc::v1::types::{Bytes as BytesJson, ToTxHash, Transaction as RpcTransaction, H160 as H160Json, H256 as H256Json};
+use rpc::v1::types::{Bytes as BytesJson, ToTxHash, Transaction as RpcTransaction, H160 as H160Json, H256 as H256Json,
+ H264 as H264Json};
use script::{Builder as ScriptBuilder, Opcode, Script, TransactionInputSigner};
use script_pubkey::generate_contract_call_script_pubkey;
use serde_json::{self as json, Value as Json};
@@ -489,8 +490,8 @@ impl Qrc20Coin {
/// `gas_fee` should be calculated by: gas_limit * gas_price * (count of contract calls),
/// or should be sum of gas fee of all contract calls.
pub async fn get_qrc20_tx_fee(&self, gas_fee: u64) -> Result {
- match try_s!(self.get_tx_fee().await) {
- ActualTxFee::Dynamic(amount) | ActualTxFee::FixedPerKb(amount) => Ok(amount + gas_fee),
+ match try_s!(self.get_fee_rate().await) {
+ ActualFeeRate::Dynamic(amount) | ActualFeeRate::FixedPerKb(amount) => Ok(amount + gas_fee),
}
}
@@ -545,10 +546,9 @@ impl Qrc20Coin {
self.utxo.conf.fork_id,
)?;
- let miner_fee = data.fee_amount + data.unused_change;
Ok(GenerateQrc20TxResult {
signed,
- miner_fee,
+ miner_fee: data.fee_amount,
gas_fee,
})
}
@@ -609,17 +609,13 @@ impl UtxoTxBroadcastOps for Qrc20Coin {
#[cfg_attr(test, mockable)]
impl UtxoTxGenerationOps for Qrc20Coin {
/// Get only QTUM transaction fee.
- async fn get_tx_fee(&self) -> UtxoRpcResult { utxo_common::get_tx_fee(&self.utxo).await }
+ async fn get_fee_rate(&self) -> UtxoRpcResult { utxo_common::get_fee_rate(&self.utxo).await }
- async fn calc_interest_if_required(
- &self,
- unsigned: TransactionInputSigner,
- data: AdditionalTxData,
- my_script_pub: ScriptBytes,
- dust: u64,
- ) -> UtxoRpcResult<(TransactionInputSigner, AdditionalTxData)> {
- utxo_common::calc_interest_if_required(self, unsigned, data, my_script_pub, dust).await
+ async fn calc_interest_if_required(&self, unsigned: &mut TransactionInputSigner) -> UtxoRpcResult {
+ utxo_common::calc_interest_if_required(self, unsigned).await
}
+
+ fn supports_interest(&self) -> bool { utxo_common::is_kmd(self) }
}
#[async_trait]
@@ -847,7 +843,8 @@ impl SwapOps for Qrc20Coin {
},
};
let fee_tx_hash = fee_tx.hash().reversed().into();
- let inputs_signed_by_pub = check_all_utxo_inputs_signed_by_pub(fee_tx, validate_fee_args.expected_sender)?;
+ let inputs_signed_by_pub =
+ check_all_utxo_inputs_signed_by_pub(self, fee_tx, validate_fee_args.expected_sender).await?;
if !inputs_signed_by_pub {
return MmError::err(ValidatePaymentError::WrongPaymentTx(
"The dex fee was sent from wrong address".to_string(),
@@ -1030,6 +1027,11 @@ impl MarketCoinOps for Qrc20Coin {
fn my_address(&self) -> MmResult { utxo_common::my_address(self) }
+ fn address_from_pubkey(&self, pubkey: &H264Json) -> MmResult {
+ let pubkey = Public::Compressed((*pubkey).into());
+ Ok(UtxoCommonOps::address_from_pubkey(self, &pubkey).to_string())
+ }
+
async fn get_public_key(&self) -> Result> {
let pubkey = utxo_common::my_public_key(self.as_ref())?;
Ok(pubkey.to_string())
@@ -1039,8 +1041,8 @@ impl MarketCoinOps for Qrc20Coin {
utxo_common::sign_message_hash(self.as_ref(), message)
}
- fn sign_message(&self, message: &str) -> SignatureResult {
- utxo_common::sign_message(self.as_ref(), message)
+ fn sign_message(&self, message: &str, address: Option) -> SignatureResult {
+ utxo_common::sign_message(self.as_ref(), message, address)
}
fn verify_message(&self, signature_base64: &str, message: &str, address: &str) -> VerificationResult {
diff --git a/mm2src/coins/qrc20/qrc20_tests.rs b/mm2src/coins/qrc20/qrc20_tests.rs
index caf5546de2..f4dd5a7121 100644
--- a/mm2src/coins/qrc20/qrc20_tests.rs
+++ b/mm2src/coins/qrc20/qrc20_tests.rs
@@ -59,8 +59,8 @@ pub fn qrc20_coin_for_test(priv_key: [u8; 32], fallback_swap: Option<&str>) -> (
(ctx, coin)
}
-fn check_tx_fee(coin: &Qrc20Coin, expected_tx_fee: ActualTxFee) {
- let actual_tx_fee = block_on(coin.get_tx_fee()).unwrap();
+fn check_tx_fee(coin: &Qrc20Coin, expected_tx_fee: ActualFeeRate) {
+ let actual_tx_fee = block_on(coin.get_fee_rate()).unwrap();
assert_eq!(actual_tx_fee, expected_tx_fee);
}
@@ -429,6 +429,7 @@ fn test_validate_fee() {
}
#[test]
+#[ignore]
fn test_wait_for_tx_spend_malicious() {
// priv_key of qXxsj5RtciAby9T7m98AgAATL4zTi4UwDG
let priv_key = [
@@ -712,7 +713,7 @@ fn test_get_trade_fee() {
];
let (_ctx, coin) = qrc20_coin_for_test(priv_key, None);
// check if the coin's tx fee is expected
- check_tx_fee(&coin, ActualTxFee::FixedPerKb(EXPECTED_TX_FEE as u64));
+ check_tx_fee(&coin, ActualFeeRate::FixedPerKb(EXPECTED_TX_FEE as u64));
let actual_trade_fee = block_on_f01(coin.get_trade_fee()).unwrap();
let expected_trade_fee_amount = big_decimal_from_sat(
@@ -739,7 +740,7 @@ fn test_sender_trade_preimage_zero_allowance() {
];
let (_ctx, coin) = qrc20_coin_for_test(priv_key, None);
// check if the coin's tx fee is expected
- check_tx_fee(&coin, ActualTxFee::FixedPerKb(EXPECTED_TX_FEE as u64));
+ check_tx_fee(&coin, ActualFeeRate::FixedPerKb(EXPECTED_TX_FEE as u64));
let allowance = block_on(coin.allowance(coin.swap_contract_address)).expect("!allowance");
assert_eq!(allowance, 0.into());
@@ -775,7 +776,7 @@ fn test_sender_trade_preimage_with_allowance() {
];
let (_ctx, coin) = qrc20_coin_for_test(priv_key, None);
// check if the coin's tx fee is expected
- check_tx_fee(&coin, ActualTxFee::FixedPerKb(EXPECTED_TX_FEE as u64));
+ check_tx_fee(&coin, ActualFeeRate::FixedPerKb(EXPECTED_TX_FEE as u64));
let allowance = block_on(coin.allowance(coin.swap_contract_address)).expect("!allowance");
assert_eq!(allowance, 300_000_000.into());
@@ -886,7 +887,7 @@ fn test_receiver_trade_preimage() {
];
let (_ctx, coin) = qrc20_coin_for_test(priv_key, None);
// check if the coin's tx fee is expected
- check_tx_fee(&coin, ActualTxFee::FixedPerKb(EXPECTED_TX_FEE as u64));
+ check_tx_fee(&coin, ActualFeeRate::FixedPerKb(EXPECTED_TX_FEE as u64));
let actual =
block_on_f01(coin.get_receiver_trade_fee(FeeApproxStage::WithoutApprox)).expect("!get_receiver_trade_fee");
@@ -911,7 +912,7 @@ fn test_taker_fee_tx_fee() {
];
let (_ctx, coin) = qrc20_coin_for_test(priv_key, None);
// check if the coin's tx fee is expected
- check_tx_fee(&coin, ActualTxFee::FixedPerKb(EXPECTED_TX_FEE as u64));
+ check_tx_fee(&coin, ActualFeeRate::FixedPerKb(EXPECTED_TX_FEE as u64));
let expected_balance = CoinBalance {
spendable: BigDecimal::from(5u32),
unspendable: BigDecimal::from(0u32),
diff --git a/mm2src/coins/rpc_command/get_enabled_coins.rs b/mm2src/coins/rpc_command/get_enabled_coins.rs
index 543f6160eb..d746d298df 100644
--- a/mm2src/coins/rpc_command/get_enabled_coins.rs
+++ b/mm2src/coins/rpc_command/get_enabled_coins.rs
@@ -5,7 +5,7 @@ use mm2_core::mm_ctx::MmArc;
use mm2_err_handle::prelude::MmResult;
use mm2_err_handle::prelude::*;
-#[derive(Serialize, Display, SerializeErrorType)]
+#[derive(Debug, Display, Serialize, SerializeErrorType)]
#[serde(tag = "error_type", content = "error_data")]
pub enum GetEnabledCoinsError {
#[display(fmt = "Internal error: {}", _0)]
@@ -23,17 +23,17 @@ impl HttpStatusCode for GetEnabledCoinsError {
#[derive(Deserialize)]
pub struct GetEnabledCoinsRequest;
-#[derive(Serialize)]
+#[derive(Debug, Serialize)]
pub struct GetEnabledCoinsResponse {
- coins: Vec,
+ pub coins: Vec,
}
-#[derive(Serialize)]
+#[derive(Debug, Serialize)]
pub struct EnabledCoinV2 {
ticker: String,
}
-pub async fn get_enabled_coins(
+pub async fn get_enabled_coins_rpc(
ctx: MmArc,
_req: GetEnabledCoinsRequest,
) -> MmResult {
diff --git a/mm2src/coins/rpc_command/init_create_account.rs b/mm2src/coins/rpc_command/init_create_account.rs
index c323ffe78a..774ab3bc77 100644
--- a/mm2src/coins/rpc_command/init_create_account.rs
+++ b/mm2src/coins/rpc_command/init_create_account.rs
@@ -318,7 +318,12 @@ impl RpcTask for InitCreateAccountTask {
self.task_state.clone(),
task_handle,
eth.is_trezor(),
- CoinProtocol::ETH,
+ // Todo: add support for Tron by checking eth.chain_spec
+ CoinProtocol::ETH {
+ chain_id: eth.chain_id().ok_or_else(|| {
+ CreateAccountRpcError::Internal("chain_id should be available for an EVM coin".to_string())
+ })?,
+ },
)
.await?,
)),
diff --git a/mm2src/coins/rpc_command/lightning/open_channel.rs b/mm2src/coins/rpc_command/lightning/open_channel.rs
index fdb5b9caa9..095ee1c4ee 100644
--- a/mm2src/coins/rpc_command/lightning/open_channel.rs
+++ b/mm2src/coins/rpc_command/lightning/open_channel.rs
@@ -174,7 +174,7 @@ pub async fn open_channel(ctx: MmArc, req: OpenChannelRequest) -> OpenChannelRes
.with_fee_policy(fee_policy);
let fee = platform_coin
- .get_tx_fee()
+ .get_fee_rate()
.await
.map_err(|e| OpenChannelError::RpcError(e.to_string()))?;
tx_builder = tx_builder.with_fee(fee);
diff --git a/mm2src/coins/rpc_command/mod.rs b/mm2src/coins/rpc_command/mod.rs
index c401853b2d..a47a9bf25a 100644
--- a/mm2src/coins/rpc_command/mod.rs
+++ b/mm2src/coins/rpc_command/mod.rs
@@ -7,5 +7,6 @@ pub mod init_account_balance;
pub mod init_create_account;
pub mod init_scan_for_new_addresses;
pub mod init_withdraw;
-#[cfg(not(target_arch = "wasm32"))] pub mod lightning;
pub mod tendermint;
+
+#[cfg(not(target_arch = "wasm32"))] pub mod lightning;
diff --git a/mm2src/coins/rpc_command/tendermint/ibc.rs b/mm2src/coins/rpc_command/tendermint/ibc.rs
new file mode 100644
index 0000000000..48df82c44a
--- /dev/null
+++ b/mm2src/coins/rpc_command/tendermint/ibc.rs
@@ -0,0 +1,12 @@
+use std::fmt;
+
+#[derive(Clone, Copy, Debug, Deserialize, Eq, PartialEq, Serialize, Hash)]
+pub struct ChannelId(u16);
+
+impl fmt::Display for ChannelId {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "channel-{}", self.0) }
+}
+
+impl ChannelId {
+ pub fn new(id: u16) -> Self { Self(id) }
+}
diff --git a/mm2src/coins/rpc_command/tendermint/ibc_chains.rs b/mm2src/coins/rpc_command/tendermint/ibc_chains.rs
deleted file mode 100644
index 67ed93e9fa..0000000000
--- a/mm2src/coins/rpc_command/tendermint/ibc_chains.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-use common::HttpStatusCode;
-use mm2_core::mm_ctx::MmArc;
-use mm2_err_handle::prelude::MmError;
-
-use crate::tendermint;
-
-pub type IBCChainRegistriesResult = Result>;
-
-#[derive(Clone, Serialize)]
-pub struct IBCChainRegistriesResponse {
- pub(crate) chain_registry_list: Vec,
-}
-
-#[derive(Clone, Debug, Display, Serialize, SerializeErrorType, PartialEq)]
-#[serde(tag = "error_type", content = "error_data")]
-pub enum IBCChainsRequestError {
- #[display(fmt = "Transport error: {}", _0)]
- Transport(String),
- #[display(fmt = "Internal error: {}", _0)]
- InternalError(String),
-}
-
-impl HttpStatusCode for IBCChainsRequestError {
- fn status_code(&self) -> common::StatusCode {
- match self {
- IBCChainsRequestError::Transport(_) => common::StatusCode::SERVICE_UNAVAILABLE,
- IBCChainsRequestError::InternalError(_) => common::StatusCode::INTERNAL_SERVER_ERROR,
- }
- }
-}
-
-#[inline(always)]
-pub async fn ibc_chains(_ctx: MmArc, _req: serde_json::Value) -> IBCChainRegistriesResult {
- tendermint::get_ibc_chain_list().await
-}
diff --git a/mm2src/coins/rpc_command/tendermint/ibc_transfer_channels.rs b/mm2src/coins/rpc_command/tendermint/ibc_transfer_channels.rs
deleted file mode 100644
index 4edcd0cd55..0000000000
--- a/mm2src/coins/rpc_command/tendermint/ibc_transfer_channels.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-use common::HttpStatusCode;
-use mm2_core::mm_ctx::MmArc;
-use mm2_err_handle::prelude::MmError;
-
-use crate::{coin_conf, tendermint::get_ibc_transfer_channels};
-
-pub type IBCTransferChannelsResult = Result>;
-
-#[derive(Clone, Deserialize)]
-pub struct IBCTransferChannelsRequest {
- pub(crate) source_coin: String,
- pub(crate) destination_coin: String,
-}
-
-#[derive(Clone, Serialize)]
-pub struct IBCTransferChannelsResponse {
- pub(crate) ibc_transfer_channels: Vec,
-}
-
-#[derive(Clone, Serialize, Deserialize)]
-pub(crate) struct IBCTransferChannel {
- pub(crate) channel_id: String,
- pub(crate) ordering: String,
- pub(crate) version: String,
- pub(crate) tags: Option,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub(crate) struct IBCTransferChannelTag {
- pub(crate) status: String,
- pub(crate) preferred: bool,
- pub(crate) dex: Option,
-}
-
-#[derive(Clone, Debug, Display, Serialize, SerializeErrorType, PartialEq)]
-#[serde(tag = "error_type", content = "error_data")]
-pub enum IBCTransferChannelsRequestError {
- #[display(fmt = "No such coin {}", _0)]
- NoSuchCoin(String),
- #[display(
- fmt = "Only tendermint based coins are allowed for `ibc_transfer_channels` operation. Current coin: {}",
- _0
- )]
- UnsupportedCoin(String),
- #[display(
- fmt = "'chain_registry_name' was not found in coins configuration for '{}' prefix. Either update the coins configuration or use 'ibc_source_channel' in the request.",
- _0
- )]
- RegistryNameIsMissing(String),
- #[display(fmt = "Could not find '{}' registry source.", _0)]
- RegistrySourceCouldNotFound(String),
- #[display(fmt = "Transport error: {}", _0)]
- Transport(String),
- #[display(fmt = "Could not found channel for '{}'.", _0)]
- CouldNotFindChannel(String),
- #[display(fmt = "Internal error: {}", _0)]
- InternalError(String),
-}
-
-impl HttpStatusCode for IBCTransferChannelsRequestError {
- fn status_code(&self) -> common::StatusCode {
- match self {
- IBCTransferChannelsRequestError::UnsupportedCoin(_) | IBCTransferChannelsRequestError::NoSuchCoin(_) => {
- common::StatusCode::BAD_REQUEST
- },
- IBCTransferChannelsRequestError::CouldNotFindChannel(_)
- | IBCTransferChannelsRequestError::RegistryNameIsMissing(_)
- | IBCTransferChannelsRequestError::RegistrySourceCouldNotFound(_) => common::StatusCode::NOT_FOUND,
- IBCTransferChannelsRequestError::Transport(_) => common::StatusCode::SERVICE_UNAVAILABLE,
- IBCTransferChannelsRequestError::InternalError(_) => common::StatusCode::INTERNAL_SERVER_ERROR,
- }
- }
-}
-
-pub async fn ibc_transfer_channels(ctx: MmArc, req: IBCTransferChannelsRequest) -> IBCTransferChannelsResult {
- let source_coin_conf = coin_conf(&ctx, &req.source_coin);
- let source_registry_name = source_coin_conf
- .get("protocol")
- .unwrap_or(&serde_json::Value::Null)
- .get("protocol_data")
- .unwrap_or(&serde_json::Value::Null)
- .get("chain_registry_name")
- .map(|t| t.as_str().unwrap_or_default().to_owned());
-
- let Some(source_registry_name) = source_registry_name else {
- return MmError::err(IBCTransferChannelsRequestError::RegistryNameIsMissing(req.source_coin));
- };
-
- let destination_coin_conf = coin_conf(&ctx, &req.destination_coin);
- let destination_registry_name = destination_coin_conf
- .get("protocol")
- .unwrap_or(&serde_json::Value::Null)
- .get("protocol_data")
- .unwrap_or(&serde_json::Value::Null)
- .get("chain_registry_name")
- .map(|t| t.as_str().unwrap_or_default().to_owned());
-
- let Some(destination_registry_name) = destination_registry_name else {
- return MmError::err(IBCTransferChannelsRequestError::RegistryNameIsMissing(
- req.destination_coin,
- ));
- };
-
- get_ibc_transfer_channels(source_registry_name, destination_registry_name).await
-}
diff --git a/mm2src/coins/rpc_command/tendermint/mod.rs b/mm2src/coins/rpc_command/tendermint/mod.rs
index 9a3d714bd3..d0f2c82685 100644
--- a/mm2src/coins/rpc_command/tendermint/mod.rs
+++ b/mm2src/coins/rpc_command/tendermint/mod.rs
@@ -1,13 +1,2 @@
-mod ibc_chains;
-mod ibc_transfer_channels;
+pub mod ibc;
pub mod staking;
-
-pub use ibc_chains::*;
-pub use ibc_transfer_channels::*;
-
-// Global constants for interacting with https://github.com/KomodoPlatform/chain-registry repository
-// using `mm2_git` crate.
-pub(crate) const CHAIN_REGISTRY_REPO_OWNER: &str = "KomodoPlatform";
-pub(crate) const CHAIN_REGISTRY_REPO_NAME: &str = "chain-registry";
-pub(crate) const CHAIN_REGISTRY_BRANCH: &str = "nucl";
-pub(crate) const CHAIN_REGISTRY_IBC_DIR_NAME: &str = "_IBC";
diff --git a/mm2src/coins/rpc_command/tendermint/staking.rs b/mm2src/coins/rpc_command/tendermint/staking.rs
index 190477b7bd..519c18cc38 100644
--- a/mm2src/coins/rpc_command/tendermint/staking.rs
+++ b/mm2src/coins/rpc_command/tendermint/staking.rs
@@ -3,7 +3,8 @@ use cosmrs::staking::{Commission, Description, Validator};
use mm2_err_handle::prelude::MmError;
use mm2_number::BigDecimal;
-use crate::{hd_wallet::WithdrawFrom, tendermint::TendermintCoinRpcError, MmCoinEnum, StakingInfoError, WithdrawFee};
+use crate::{hd_wallet::HDAddressSelector, tendermint::TendermintCoinRpcError, MmCoinEnum, StakingInfoError,
+ WithdrawFee};
/// Represents current status of the validator.
#[derive(Debug, Default, Deserialize)]
@@ -47,7 +48,8 @@ impl From for StakingInfoError {
match e {
TendermintCoinRpcError::InvalidResponse(e)
| TendermintCoinRpcError::PerformError(e)
- | TendermintCoinRpcError::RpcClientError(e) => StakingInfoError::Transport(e),
+ | TendermintCoinRpcError::RpcClientError(e)
+ | TendermintCoinRpcError::NotFound(e) => StakingInfoError::Transport(e),
TendermintCoinRpcError::Prost(e) | TendermintCoinRpcError::InternalError(e) => StakingInfoError::Internal(e),
TendermintCoinRpcError::UnexpectedAccountType { .. } => StakingInfoError::Internal(
"RPC client got an unexpected error 'TendermintCoinRpcError::UnexpectedAccountType', this isn't normal."
@@ -130,7 +132,7 @@ pub async fn validators_rpc(
pub struct DelegationPayload {
pub validator_address: String,
pub fee: Option,
- pub withdraw_from: Option,
+ pub withdraw_from: Option,
#[serde(default)]
pub memo: String,
#[serde(default)]
diff --git a/mm2src/coins/siacoin.rs b/mm2src/coins/siacoin.rs
index bb5ec12353..c0b82f313b 100644
--- a/mm2src/coins/siacoin.rs
+++ b/mm2src/coins/siacoin.rs
@@ -1,12 +1,15 @@
use super::{BalanceError, CoinBalance, HistorySyncState, MarketCoinOps, MmCoin, RawTransactionFut,
RawTransactionRequest, SwapOps, TradeFee, TransactionEnum};
-use crate::{coin_errors::MyAddressError, BalanceFut, CanRefundHtlc, CheckIfMyPaymentSentArgs, ConfirmPaymentInput,
- DexFee, FeeApproxStage, FoundSwapTxSpend, NegotiateSwapContractAddrErr, PrivKeyBuildPolicy, PrivKeyPolicy,
- RawTransactionResult, RefundPaymentArgs, SearchForSwapTxSpendInput, SendPaymentArgs,
- SignRawTransactionRequest, SignatureResult, SpendPaymentArgs, TradePreimageFut, TradePreimageResult,
- TradePreimageValue, TransactionResult, TxMarshalingErr, UnexpectedDerivationMethod, ValidateAddressResult,
- ValidateFeeArgs, ValidateOtherPubKeyErr, ValidatePaymentInput, ValidatePaymentResult, VerificationResult,
- WaitForHTLCTxSpendArgs, WatcherOps, WeakSpawner, WithdrawFut, WithdrawRequest};
+use crate::hd_wallet::HDAddressSelector;
+use crate::{coin_errors::MyAddressError, AddressFromPubkeyError, BalanceFut, CanRefundHtlc, CheckIfMyPaymentSentArgs,
+ ConfirmPaymentInput, DexFee, FeeApproxStage, FoundSwapTxSpend, NegotiateSwapContractAddrErr,
+ PrivKeyBuildPolicy, PrivKeyPolicy, RawTransactionResult, RefundPaymentArgs, SearchForSwapTxSpendInput,
+ SendPaymentArgs, SignRawTransactionRequest, SignatureResult, SpendPaymentArgs, TradePreimageFut,
+ TradePreimageResult, TradePreimageValue, TransactionResult, TxMarshalingErr, UnexpectedDerivationMethod,
+ ValidateAddressResult, ValidateFeeArgs, ValidateOtherPubKeyErr, ValidatePaymentInput,
+ ValidatePaymentResult, VerificationResult, WaitForHTLCTxSpendArgs, WatcherOps, WeakSpawner, WithdrawFut,
+ WithdrawRequest};
+use crate::{SignatureError, VerificationError};
use async_trait::async_trait;
use common::executor::AbortedError;
pub use ed25519_dalek::{Keypair, PublicKey, SecretKey, Signature};
@@ -16,7 +19,7 @@ use keys::KeyPair;
use mm2_core::mm_ctx::MmArc;
use mm2_err_handle::prelude::*;
use mm2_number::{BigDecimal, BigInt, MmNumber};
-use rpc::v1::types::Bytes as BytesJson;
+use rpc::v1::types::{Bytes as BytesJson, H264 as H264Json};
use serde_json::Value as Json;
use std::ops::Deref;
use std::sync::Arc;
@@ -307,19 +310,37 @@ impl MarketCoinOps for SiaCoin {
)
.into());
},
+ PrivKeyPolicy::WalletConnect { .. } => {
+ return Err(MyAddressError::UnexpectedDerivationMethod(
+ "WalletConnect not yet supported. Must use iguana seed.".to_string(),
+ )
+ .into())
+ },
};
let address = SpendPolicy::PublicKey(key_pair.public).address();
Ok(address.to_string())
}
- async fn get_public_key(&self) -> Result> { unimplemented!() }
+ fn address_from_pubkey(&self, pubkey: &H264Json) -> MmResult {
+ let pubkey = PublicKey::from_bytes(&pubkey.0[..32]).map_err(|e| {
+ AddressFromPubkeyError::InternalError(format!("Couldn't parse bytes into ed25519 pubkey: {e:?}"))
+ })?;
+ let address = SpendPolicy::PublicKey(pubkey).address();
+ Ok(address.to_string())
+ }
- fn sign_message_hash(&self, _message: &str) -> Option<[u8; 32]> { unimplemented!() }
+ async fn get_public_key(&self) -> Result> {
+ MmError::err(UnexpectedDerivationMethod::InternalError("Not implemented".into()))
+ }
+
+ fn sign_message_hash(&self, _message: &str) -> Option<[u8; 32]> { None }
- fn sign_message(&self, _message: &str) -> SignatureResult { unimplemented!() }
+ fn sign_message(&self, _message: &str, _address: Option) -> SignatureResult {
+ MmError::err(SignatureError::InternalError("Not implemented".into()))
+ }
fn verify_message(&self, _signature: &str, _message: &str, _address: &str) -> VerificationResult {
- unimplemented!()
+ MmError::err(VerificationError::InternalError("Not implemented".into()))
}
fn my_balance(&self) -> BalanceFut {
diff --git a/mm2src/coins/tendermint/htlc/mod.rs b/mm2src/coins/tendermint/htlc/mod.rs
index 5675c915f2..77b38b8208 100644
--- a/mm2src/coins/tendermint/htlc/mod.rs
+++ b/mm2src/coins/tendermint/htlc/mod.rs
@@ -33,8 +33,8 @@ impl FromStr for HtlcType {
fn from_str(s: &str) -> Result {
match s {
- "iaa" => Ok(HtlcType::Iris),
- "nuc" => Ok(HtlcType::Nucleus),
+ super::IRIS_PREFIX => Ok(HtlcType::Iris),
+ super::NUCLEUS_PREFIX => Ok(HtlcType::Nucleus),
unsupported => Err(io::Error::new(
io::ErrorKind::Unsupported,
format!("Account type '{unsupported}' is not supported for HTLCs"),
diff --git a/mm2src/coins/tendermint/mod.rs b/mm2src/coins/tendermint/mod.rs
index ac88f1bac9..a1b2cc1edd 100644
--- a/mm2src/coins/tendermint/mod.rs
+++ b/mm2src/coins/tendermint/mod.rs
@@ -10,11 +10,13 @@ pub mod tendermint_balance_events;
mod tendermint_coin;
mod tendermint_token;
pub mod tendermint_tx_history_v2;
+pub mod wallet_connect;
pub use cosmrs::tendermint::PublicKey as TendermintPublicKey;
pub use cosmrs::AccountId;
pub use tendermint_coin::*;
pub use tendermint_token::*;
+pub use wallet_connect::*;
pub(crate) const BCH_COIN_PROTOCOL_TYPE: &str = "BCH";
pub(crate) const BCH_TOKEN_PROTOCOL_TYPE: &str = "SLPTOKEN";
diff --git a/mm2src/coins/tendermint/tendermint_balance_events.rs b/mm2src/coins/tendermint/tendermint_balance_events.rs
index eed451b5dd..3304e35e97 100644
--- a/mm2src/coins/tendermint/tendermint_balance_events.rs
+++ b/mm2src/coins/tendermint/tendermint_balance_events.rs
@@ -3,7 +3,7 @@ use common::{http_uri_to_ws_address, log, PROXY_REQUEST_EXPIRATION_SEC};
use futures::channel::oneshot;
use futures_util::{SinkExt, StreamExt};
use jsonrpc_core::{Id as RpcId, Params as RpcParams, Value as RpcValue, Version as RpcVersion};
-use mm2_event_stream::{Broadcaster, Event, EventStreamer, NoDataIn, StreamHandlerInput};
+use mm2_event_stream::{Broadcaster, Event, EventStreamer, NoDataIn, StreamHandlerInput, StreamerId};
use mm2_number::BigDecimal;
use proxy_signature::RawMessage;
use std::collections::{HashMap, HashSet};
@@ -23,7 +23,11 @@ impl TendermintBalanceEventStreamer {
impl EventStreamer for TendermintBalanceEventStreamer {
type DataInType = NoDataIn;
- fn streamer_id(&self) -> String { format!("BALANCE:{}", self.coin.ticker()) }
+ fn streamer_id(&self) -> StreamerId {
+ StreamerId::Balance {
+ coin: self.coin.ticker().to_string(),
+ }
+ }
async fn handle(
self,
diff --git a/mm2src/coins/tendermint/tendermint_coin.rs b/mm2src/coins/tendermint/tendermint_coin.rs
index 3f5f8a33de..b442f94ab2 100644
--- a/mm2src/coins/tendermint/tendermint_coin.rs
+++ b/mm2src/coins/tendermint/tendermint_coin.rs
@@ -3,17 +3,13 @@ use super::htlc::{ClaimHtlcMsg, ClaimHtlcProto, CreateHtlcMsg, CreateHtlcProto,
QueryHtlcResponse, TendermintHtlc, HTLC_STATE_COMPLETED, HTLC_STATE_OPEN, HTLC_STATE_REFUNDED};
use super::ibc::transfer_v1::MsgTransfer;
use super::ibc::IBC_GAS_LIMIT_DEFAULT;
-use super::{rpc::*, TENDERMINT_COIN_PROTOCOL_TYPE};
-use crate::coin_errors::{MyAddressError, ValidatePaymentError, ValidatePaymentResult};
-use crate::hd_wallet::{HDPathAccountToAddressId, WithdrawFrom};
+use super::rpc::*;
+use crate::coin_errors::{AddressFromPubkeyError, MyAddressError, ValidatePaymentError, ValidatePaymentResult};
+use crate::hd_wallet::{HDAddressSelector, HDPathAccountToAddressId};
+use crate::rpc_command::tendermint::ibc::ChannelId;
use crate::rpc_command::tendermint::staking::{ClaimRewardsPayload, Delegation, DelegationPayload,
DelegationsQueryResponse, Undelegation, UndelegationEntry,
UndelegationsQueryResponse, ValidatorStatus};
-use crate::rpc_command::tendermint::{IBCChainRegistriesResponse, IBCChainRegistriesResult, IBCChainsRequestError,
- IBCTransferChannel, IBCTransferChannelTag, IBCTransferChannelsRequestError,
- IBCTransferChannelsResponse, IBCTransferChannelsResult, CHAIN_REGISTRY_BRANCH,
- CHAIN_REGISTRY_IBC_DIR_NAME, CHAIN_REGISTRY_REPO_NAME, CHAIN_REGISTRY_REPO_OWNER};
-use crate::tendermint::ibc::IBC_OUT_SOURCE_PORT;
use crate::utxo::sat_from_big_decimal;
use crate::utxo::utxo_common::big_decimal_from_sat;
use crate::{big_decimal_from_sat_unsigned, BalanceError, BalanceFut, BigDecimal, CheckIfMyPaymentSentArgs,
@@ -54,6 +50,8 @@ use cosmrs::proto::cosmos::staking::v1beta1::{QueryDelegationRequest, QueryDeleg
QueryValidatorsResponse as QueryValidatorsResponseProto};
use cosmrs::proto::cosmos::tx::v1beta1::{GetTxRequest, GetTxResponse, SimulateRequest, SimulateResponse, Tx, TxBody,
TxRaw};
+use cosmrs::proto::ibc;
+use cosmrs::proto::ibc::core::channel::v1::{QueryChannelRequest, QueryChannelResponse};
use cosmrs::proto::prost::{DecodeError, Message};
use cosmrs::staking::{MsgDelegate, MsgUndelegate, QueryValidatorsResponse, Validator};
use cosmrs::tendermint::block::Height;
@@ -70,10 +68,10 @@ use futures::{FutureExt, TryFutureExt};
use futures01::Future;
use hex::FromHexError;
use itertools::Itertools;
+use kdf_walletconnect::{WalletConnectCtx, WalletConnectOps};
use keys::{KeyPair, Public};
use mm2_core::mm_ctx::{MmArc, MmWeak};
use mm2_err_handle::prelude::*;
-use mm2_git::{FileMetadata, GitController, GithubClient, RepositoryOperations, GITHUB_API_URI};
use mm2_number::bigdecimal::ParseBigDecimalError;
use mm2_number::MmNumber;
use mm2_p2p::p2p_ctx::P2PContext;
@@ -81,7 +79,7 @@ use num_traits::Zero;
use parking_lot::Mutex as PaMutex;
use primitives::hash::H256;
use regex::Regex;
-use rpc::v1::types::Bytes as BytesJson;
+use rpc::v1::types::{Bytes as BytesJson, H264 as H264Json};
use serde_json::{self as json, Value as Json};
use std::collections::HashMap;
use std::convert::{TryFrom, TryInto};
@@ -106,6 +104,10 @@ const ABCI_DELEGATION_PATH: &str = "/cosmos.staking.v1beta1.Query/Delegation";
const ABCI_DELEGATOR_DELEGATIONS_PATH: &str = "/cosmos.staking.v1beta1.Query/DelegatorDelegations";
const ABCI_DELEGATOR_UNDELEGATIONS_PATH: &str = "/cosmos.staking.v1beta1.Query/DelegatorUnbondingDelegations";
const ABCI_DELEGATION_REWARDS_PATH: &str = "/cosmos.distribution.v1beta1.Query/DelegationRewards";
+const ABCI_IBC_CHANNEL_QUERY_PATH: &str = "/ibc.core.channel.v1.Query/Channel";
+
+#[cfg(feature = "ibc-routing-for-swaps")]
+const DEFAULT_MIN_BALANCE_FOR_IBC_ROUTING: f32 = 2.0;
pub(crate) const MIN_TX_SATOSHIS: i64 = 1;
@@ -126,6 +128,9 @@ const MIN_TIME_LOCK: i64 = 50;
const ACCOUNT_SEQUENCE_ERR: &str = "account sequence mismatch";
+pub(crate) const IRIS_PREFIX: &str = "iaa";
+pub(crate) const NUCLEUS_PREFIX: &str = "nuc";
+
lazy_static! {
static ref SEQUENCE_PARSER_REGEX: Regex = Regex::new(r"expected (\d+)").unwrap();
}
@@ -195,11 +200,15 @@ pub struct TendermintFeeDetails {
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct TendermintProtocolInfo {
pub decimals: u8,
- denom: String,
+ pub(crate) denom: Denom,
+ min_balance_for_ibc_routing: Option,
pub account_prefix: String,
- chain_id: String,
+ pub chain_id: ChainId,
gas_price: Option,
- chain_registry_name: Option,
+ /// Key represents the account prefix of the target chain and
+ /// the value is the channel ID used for sending transactions.
+ #[serde(default)]
+ ibc_channels: HashMap,
}
#[derive(Clone)]
@@ -287,14 +296,17 @@ impl TendermintActivationPolicy {
PublicKey::from_raw_secp256k1(&activated_key.public_key.to_bytes())
.ok_or_else(|| io::Error::new(io::ErrorKind::InvalidData, "Couldn't generate public key"))
},
-
PrivKeyPolicy::Trezor => Err(io::Error::new(
io::ErrorKind::Unsupported,
"Trezor is not supported yet!",
)),
-
+ PrivKeyPolicy::WalletConnect { public_key, .. } => PublicKey::from_raw_secp256k1(public_key.as_bytes())
+ .ok_or_else(|| io::Error::new(io::ErrorKind::InvalidData, "Couldn't generate public key")),
#[cfg(target_arch = "wasm32")]
- PrivKeyPolicy::Metamask(_) => unreachable!(),
+ PrivKeyPolicy::Metamask(_) => Err(io::Error::new(
+ io::ErrorKind::Unsupported,
+ "Metamask is not supported yet!",
+ )),
},
Self::PublicKey(account_public_key) => Ok(*account_public_key),
}
@@ -373,27 +385,35 @@ impl RpcCommonOps for TendermintCoin {
}
}
+#[derive(PartialEq)]
+pub enum TendermintWalletConnectionType {
+ Wc(String),
+ WcLedger(String),
+ KeplrLedger,
+ Keplr,
+ Native,
+}
+
+impl Default for TendermintWalletConnectionType {
+ fn default() -> Self { Self::Native }
+}
+
pub struct TendermintCoinImpl {
ticker: String,
/// As seconds
avg_blocktime: u8,
/// My address
pub account_id: AccountId,
- pub(super) account_prefix: String,
pub activation_policy: TendermintActivationPolicy,
- pub(crate) decimals: u8,
- pub(super) denom: Denom,
- chain_id: ChainId,
- gas_price: Option,
pub tokens_info: PaMutex>,
/// This spawner is used to spawn coin's related futures that should be aborted on coin deactivation
/// or on [`MmArc::stop`].
pub(super) abortable_system: AbortableQueue,
pub(crate) history_sync_state: Mutex,
client: TendermintRpcClient,
- pub(crate) chain_registry_name: Option,
pub ctx: MmWeak,
- pub(crate) is_keplr_from_ledger: bool,
+ pub(crate) wallet_type: TendermintWalletConnectionType,
+ pub(crate) protocol_info: TendermintProtocolInfo,
}
#[derive(Clone)]
@@ -419,7 +439,6 @@ pub enum TendermintInitErrorKind {
EmptyRpcUrls,
RpcClientInitError(String),
InvalidChainId(String),
- InvalidDenom(String),
InvalidProtocolData(String),
InvalidPathToAddress(String),
#[display(fmt = "'derivation_path' field is not found in config")]
@@ -439,6 +458,10 @@ pub enum TendermintInitErrorKind {
#[display(fmt = "avg_blocktime must be in-between '0' and '255'.")]
AvgBlockTimeInvalid,
BalanceStreamInitError(String),
+ #[display(fmt = "Watcher features can not be used with pubkey-only activation policy.")]
+ CantUseWatchersWithPubkeyPolicy,
+ #[display(fmt = "Unable to fetch account for chain: {_0}")]
+ UnableToFetchChainAccount(String),
}
/// TODO: Rename this into `ClientRpcError` because this is very
@@ -455,6 +478,31 @@ pub enum TendermintCoinRpcError {
UnexpectedAccountType {
prefix: String,
},
+ NotFound(String),
+}
+
+#[derive(Clone, Debug, Display, PartialEq, Serialize)]
+pub enum IBCError {
+ #[display(
+ fmt = "IBC channel could not be found in coins file for '{}' address prefix. Provide it manually by including `ibc_source_channel` in the request.",
+ address_prefix
+ )]
+ IBCChannelCouldNotBeFound { address_prefix: String },
+ #[display(
+ fmt = "IBC channel '{}' is not healthy. Provide a healthy one manually by including `ibc_source_channel` in the request.",
+ channel_id
+ )]
+ IBCChannelNotHealthy { channel_id: ChannelId },
+ #[display(fmt = "IBC channel '{}' is not present on the target node.", channel_id)]
+ IBCChannelMissingOnNode { channel_id: ChannelId },
+ #[display(fmt = "Transport error: {reason}")]
+ Transport { reason: String },
+ #[display(fmt = "Internal error: {reason}")]
+ InternalError { reason: String },
+}
+
+impl From for WithdrawError {
+ fn from(err: IBCError) -> Self { WithdrawError::IBCError(err) }
}
impl From for TendermintCoinRpcError {
@@ -478,9 +526,9 @@ impl From for BalanceError {
match err {
TendermintCoinRpcError::InvalidResponse(e) => BalanceError::InvalidResponse(e),
TendermintCoinRpcError::Prost(e) => BalanceError::InvalidResponse(e),
- TendermintCoinRpcError::PerformError(e) | TendermintCoinRpcError::RpcClientError(e) => {
- BalanceError::Transport(e)
- },
+ TendermintCoinRpcError::PerformError(e)
+ | TendermintCoinRpcError::RpcClientError(e)
+ | TendermintCoinRpcError::NotFound(e) => BalanceError::Transport(e),
TendermintCoinRpcError::InternalError(e) => BalanceError::Internal(e),
TendermintCoinRpcError::UnexpectedAccountType { prefix } => {
BalanceError::Internal(format!("Account type '{prefix}' is not supported for HTLCs"))
@@ -494,9 +542,9 @@ impl From for ValidatePaymentError {
match err {
TendermintCoinRpcError::InvalidResponse(e) => ValidatePaymentError::InvalidRpcResponse(e),
TendermintCoinRpcError::Prost(e) => ValidatePaymentError::InvalidRpcResponse(e),
- TendermintCoinRpcError::PerformError(e) | TendermintCoinRpcError::RpcClientError(e) => {
- ValidatePaymentError::Transport(e)
- },
+ TendermintCoinRpcError::PerformError(e)
+ | TendermintCoinRpcError::RpcClientError(e)
+ | TendermintCoinRpcError::NotFound(e) => ValidatePaymentError::Transport(e),
TendermintCoinRpcError::InternalError(e) => ValidatePaymentError::InternalError(e),
TendermintCoinRpcError::UnexpectedAccountType { prefix } => {
ValidatePaymentError::InvalidParameter(format!("Account type '{prefix}' is not supported for HTLCs"))
@@ -606,7 +654,7 @@ impl From for SearchForSwapTxSpendErr {
#[async_trait]
impl TendermintCommons for TendermintCoin {
- fn platform_denom(&self) -> &Denom { &self.denom }
+ fn platform_denom(&self) -> &Denom { &self.protocol_info.denom }
fn set_history_sync_state(&self, new_state: HistorySyncState) {
*self.history_sync_state.lock().unwrap() = new_state;
@@ -621,7 +669,7 @@ impl TendermintCommons for TendermintCoin {
}
fn denom_to_ticker(&self, denom: &str) -> Option {
- if self.denom.as_ref() == denom {
+ if self.protocol_info.denom.as_ref() == denom {
return Some(self.ticker.clone());
}
@@ -637,9 +685,9 @@ impl TendermintCommons for TendermintCoin {
async fn get_all_balances(&self) -> MmResult {
let platform_balance_denom = self
- .account_balance_for_denom(&self.account_id, self.denom.to_string())
+ .account_balance_for_denom(&self.account_id, self.protocol_info.denom.to_string())
.await?;
- let platform_balance = big_decimal_from_sat_unsigned(platform_balance_denom, self.decimals);
+ let platform_balance = big_decimal_from_sat_unsigned(platform_balance_denom, self.protocol_info.decimals);
let ibc_assets_info = self.tokens_info.lock().clone();
let mut requests = Vec::with_capacity(ibc_assets_info.len());
@@ -679,7 +727,7 @@ impl TendermintCoin {
nodes: Vec,
tx_history: bool,
activation_policy: TendermintActivationPolicy,
- is_keplr_from_ledger: bool,
+ wallet_type: TendermintWalletConnectionType,
) -> MmResult {
if nodes.is_empty() {
return MmError::err(TendermintInitError {
@@ -702,16 +750,6 @@ impl TendermintCoin {
let client_impl = TendermintRpcClientImpl { rpc_clients };
- let chain_id = ChainId::try_from(protocol_info.chain_id).map_to_mm(|e| TendermintInitError {
- ticker: ticker.clone(),
- kind: TendermintInitErrorKind::InvalidChainId(e.to_string()),
- })?;
-
- let denom = Denom::from_str(&protocol_info.denom).map_to_mm(|e| TendermintInitError {
- ticker: ticker.clone(),
- kind: TendermintInitErrorKind::InvalidDenom(e.to_string()),
- })?;
-
let history_sync_state = if tx_history {
HistorySyncState::NotStarted
} else {
@@ -731,52 +769,99 @@ impl TendermintCoin {
Ok(TendermintCoin(Arc::new(TendermintCoinImpl {
ticker,
account_id,
- account_prefix: protocol_info.account_prefix,
activation_policy,
- decimals: protocol_info.decimals,
- denom,
- chain_id,
- gas_price: protocol_info.gas_price,
avg_blocktime: conf.avg_blocktime,
tokens_info: PaMutex::new(HashMap::new()),
abortable_system,
history_sync_state: Mutex::new(history_sync_state),
client: TendermintRpcClient(AsyncMutex::new(client_impl)),
- chain_registry_name: protocol_info.chain_registry_name,
+ protocol_info,
ctx: ctx.weak(),
- is_keplr_from_ledger,
+ wallet_type,
})))
}
- /// Extracts corresponding IBC channel ID for `AccountId` from https://github.com/KomodoPlatform/chain-registry/tree/nucl.
- pub(crate) async fn detect_channel_id_for_ibc_transfer(
+ /// Finds the IBC channel by querying the given channel ID and port ID
+ /// and returns its information.
+ async fn query_ibc_channel(
&self,
- to_address: &AccountId,
- ) -> Result> {
- let ctx = MmArc::from_weak(&self.ctx).ok_or_else(|| WithdrawError::InternalError("No context".to_owned()))?;
-
- let source_registry_name = self
- .chain_registry_name
- .clone()
- .ok_or_else(|| WithdrawError::RegistryNameIsMissing(to_address.prefix().to_owned()))?;
+ channel_id: ChannelId,
+ port_id: &str,
+ ) -> Result {
+ let payload = QueryChannelRequest {
+ channel_id: channel_id.to_string(),
+ port_id: port_id.to_string(),
+ }
+ .encode_to_vec();
- let destination_registry_name = chain_registry_name_from_account_prefix(&ctx, to_address.prefix())
- .ok_or_else(|| WithdrawError::RegistryNameIsMissing(to_address.prefix().to_owned()))?;
+ let request = AbciRequest::new(
+ Some(ABCI_IBC_CHANNEL_QUERY_PATH.to_string()),
+ payload,
+ ABCI_REQUEST_HEIGHT,
+ ABCI_REQUEST_PROVE,
+ );
- let channels = get_ibc_transfer_channels(source_registry_name, destination_registry_name)
+ let response = self
+ .rpc_client()
+ .await
+ .map_err(|e| IBCError::Transport { reason: e.to_string() })?
+ .perform(request)
.await
- .map_err(|_| WithdrawError::IBCChannelCouldNotFound(to_address.to_string()))?;
+ .map_err(|e| IBCError::Transport { reason: e.to_string() })?;
- Ok(channels
- .ibc_transfer_channels
- .last()
- .ok_or_else(|| WithdrawError::InternalError("channel list can not be empty".to_owned()))?
- .channel_id
- .clone())
+ let response = QueryChannelResponse::decode(response.response.value.as_slice())
+ .map_err(|e| IBCError::InternalError { reason: e.to_string() })?;
+
+ response.channel.ok_or(IBCError::IBCChannelMissingOnNode { channel_id })
+ }
+
+ /// Looks for a healthy IBC channel on a network that supports HTLC transactions.
+ /// Right now it first tries to find a channel on IRIS network, if none is found, then falls
+ /// back to NUCLEUS network.
+ pub async fn get_healthy_ibc_channel_to_htlc_chain(&self) -> Result> {
+ let channel_id = if let Ok(channel_id) = self.get_healthy_ibc_channel_for_address_prefix(IRIS_PREFIX).await {
+ channel_id
+ } else {
+ self.get_healthy_ibc_channel_for_address_prefix(NUCLEUS_PREFIX).await?
+ };
+
+ Ok(channel_id)
+ }
+
+ /// Returns a **healthy** IBC channel ID for the given target address.
+ pub async fn get_healthy_ibc_channel_for_address_prefix(
+ &self,
+ address_prefix: &str,
+ ) -> Result> {
+ // ref: https://github.com/cosmos/ibc-go/blob/7f34724b982581435441e0bb70598c3e3a77f061/proto/ibc/core/channel/v1/channel.proto#L51-L68
+ const STATE_OPEN: i32 = 3;
+
+ let channel_id = *self.protocol_info.ibc_channels.get(address_prefix).ok_or_else(|| {
+ IBCError::IBCChannelCouldNotBeFound {
+ address_prefix: address_prefix.to_owned(),
+ }
+ })?;
+
+ let channel = self.query_ibc_channel(channel_id, "transfer").await?;
+
+ // TODO: Extend the validation logic to also include:
+ //
+ // - Checking the time of the last update on the channel
+ // - Verifying the total amount transferred since the channel was created
+ // - Check the channel creation time
+ if channel.state != STATE_OPEN {
+ return MmError::err(IBCError::IBCChannelNotHealthy { channel_id });
+ }
+
+ Ok(channel_id)
+ }
+
+ pub fn supports_htlc(&self) -> bool {
+ matches!(self.protocol_info.account_prefix.as_str(), NUCLEUS_PREFIX | IRIS_PREFIX)
}
#[inline(always)]
- fn gas_price(&self) -> f64 { self.gas_price.unwrap_or(DEFAULT_GAS_PRICE) }
+ fn gas_price(&self) -> f64 { self.protocol_info.gas_price.unwrap_or(DEFAULT_GAS_PRICE) }
#[allow(unused)]
async fn get_latest_block(&self) -> MmResult {
@@ -820,7 +905,7 @@ impl TendermintCoin {
memo: &str,
) -> cosmrs::Result> {
let fee_amount = Coin {
- denom: self.denom.clone(),
+ denom: self.protocol_info.denom.clone(),
amount: 0_u64.into(),
};
@@ -829,7 +914,12 @@ impl TendermintCoin {
let signkey = SigningKey::from_slice(priv_key.as_slice())?;
let tx_body = tx::Body::new(vec![tx_payload], memo, timeout_height as u32);
let auth_info = SignerInfo::single_direct(Some(signkey.public_key()), account_info.sequence).auth_info(fee);
- let sign_doc = SignDoc::new(&tx_body, &auth_info, &self.chain_id, account_info.account_number)?;
+ let sign_doc = SignDoc::new(
+ &tx_body,
+ &auth_info,
+ &self.protocol_info.chain_id,
+ account_info.account_number,
+ )?;
sign_doc.sign(&signkey)?.to_bytes()
}
@@ -884,6 +974,14 @@ impl TendermintCoin {
)
},
TendermintActivationPolicy::PublicKey(_) => {
+ if self.is_wallet_connect() {
+ return try_tx_s!(
+ self.seq_safe_send_raw_tx_bytes(tx_payload, fee, timeout_height, memo)
+ .timeout(expiration)
+ .await
+ );
+ };
+
try_tx_s!(
self.send_unsigned_tx_externally(tx_payload, fee, timeout_height, memo, expiration)
.timeout(expiration)
@@ -893,6 +991,38 @@ impl TendermintCoin {
}
}
+ async fn get_tx_raw(
+ &self,
+ account_info: &BaseAccount,
+ tx_payload: Any,
+ fee: Fee,
+ timeout_height: u64,
+ memo: &str,
+ ) -> Result {
+ if self.is_wallet_connect() {
+ let ctx = try_tx_s!(MmArc::from_weak(&self.ctx).ok_or(ERRL!("ctx must be initialized already")));
+ let wc = try_tx_s!(WalletConnectCtx::from_ctx(&ctx).map_err(|e| e.to_string()));
+ let SerializedUnsignedTx { tx_json, .. } = if self.is_ledger_connection() {
+ try_tx_s!(self.any_to_legacy_amino_json(account_info, tx_payload, fee, timeout_height, memo))
+ } else {
+ try_tx_s!(self.any_to_serialized_sign_doc(account_info, tx_payload, fee, timeout_height, memo))
+ };
+
+ return Ok(try_tx_s!(self.wc_sign_tx(&wc, tx_json).await.map_err(|err| err.to_string())).into());
+ }
+
+ let tx_raw = try_tx_s!(self.any_to_signed_raw_tx(
+ try_tx_s!(self.activation_policy.activated_key_or_err()),
+ account_info,
+ tx_payload,
+ fee,
+ timeout_height,
+ memo,
+ ));
+
+ Ok(tx_raw)
+ }
+
async fn seq_safe_send_raw_tx_bytes(
&self,
tx_payload: Any,
@@ -901,31 +1031,29 @@ impl TendermintCoin {
memo: &str,
) -> Result<(String, Raw), TransactionErr> {
let mut account_info = try_tx_s!(self.account_info(&self.account_id).await);
- let (tx_id, tx_raw) = loop {
- let tx_raw = try_tx_s!(self.any_to_signed_raw_tx(
- try_tx_s!(self.activation_policy.activated_key_or_err()),
- &account_info,
- tx_payload.clone(),
- fee.clone(),
- timeout_height,
- memo,
- ));
+ loop {
+ let tx_raw = try_tx_s!(
+ self.get_tx_raw(&account_info, tx_payload.clone(), fee.clone(), timeout_height, memo,)
+ .await
+ );
- match self.send_raw_tx_bytes(&try_tx_s!(tx_raw.to_bytes())).compat().await {
- Ok(tx_id) => break (tx_id, tx_raw),
+ // Attempt to send the transaction bytes
+ match self.send_raw_tx_bytes(try_tx_s!(&tx_raw.to_bytes())).compat().await {
+ Ok(tx_id) => {
+ return Ok((tx_id, tx_raw));
+ },
Err(e) => {
+ // Handle sequence number mismatch and retry
if e.contains(ACCOUNT_SEQUENCE_ERR) {
account_info.sequence = try_tx_s!(parse_expected_sequence_number(&e));
- debug!("Got wrong account sequence, trying again.");
+ debug!("Account sequence mismatch, retrying...");
continue;
}
- return Err(crate::TransactionErr::Plain(ERRL!("{}", e)));
+ return Err(TransactionErr::Plain(ERRL!("Transaction failed: {}", e)));
},
- };
- };
-
- Ok((tx_id, tx_raw))
+ }
+ }
}
async fn send_unsigned_tx_externally(
@@ -944,32 +1072,32 @@ impl TendermintCoin {
let ctx = try_tx_s!(MmArc::from_weak(&self.ctx).ok_or(ERRL!("ctx must be initialized already")));
let account_info = try_tx_s!(self.account_info(&self.account_id).await);
- let SerializedUnsignedTx { tx_json, body_bytes } = if self.is_keplr_from_ledger {
+ let SerializedUnsignedTx { tx_json, body_bytes } = if self.is_ledger_connection() {
try_tx_s!(self.any_to_legacy_amino_json(&account_info, tx_payload, fee, timeout_height, memo))
} else {
try_tx_s!(self.any_to_serialized_sign_doc(&account_info, tx_payload, fee, timeout_height, memo))
};
let data: TxHashData = try_tx_s!(ctx
- .ask_for_data(&format!("TX_HASH:{}", self.ticker()), tx_json, timeout)
+ .ask_for_data(&format!("TX_HASH:{}", self.ticker()), tx_json.clone(), timeout)
.await
.map_err(|e| ERRL!("{}", e)));
let tx = try_tx_s!(self.request_tx(data.hash.clone()).await.map_err(|e| ERRL!("{}", e)));
- let tx_raw_inner = TxRaw {
+ let tx_raw = TxRaw {
body_bytes: tx.body.as_ref().map(Message::encode_to_vec).unwrap_or_default(),
auth_info_bytes: tx.auth_info.as_ref().map(Message::encode_to_vec).unwrap_or_default(),
signatures: tx.signatures,
};
- if body_bytes != tx_raw_inner.body_bytes {
+ if body_bytes != tx_raw.body_bytes {
return Err(crate::TransactionErr::Plain(ERRL!(
"Unsigned transaction don't match with the externally provided transaction."
)));
}
- Ok((data.hash, Raw::from(tx_raw_inner)))
+ Ok((data.hash, Raw::from(tx_raw)))
}
#[allow(deprecated)]
@@ -1135,10 +1263,10 @@ impl TendermintCoin {
.account
.or_mm_err(|| TendermintCoinRpcError::InvalidResponse("Account is None".into()))?;
- let account_prefix = self.account_prefix.clone();
+ let account_prefix = self.protocol_info.account_prefix.clone();
let base_account = match BaseAccount::decode(account.value.as_slice()) {
Ok(account) => account,
- Err(err) if account_prefix.as_str() == "iaa" => {
+ Err(err) if account_prefix.as_str() == IRIS_PREFIX => {
let ethermint_account = EthermintAccount::decode(account.value.as_slice())?;
ethermint_account
@@ -1181,7 +1309,7 @@ impl TendermintCoin {
pub(super) fn extract_account_id_and_private_key(
&self,
- withdraw_from: Option,
+ withdraw_from: Option,
) -> Result<(AccountId, Option), io::Error> {
if let TendermintActivationPolicy::PublicKey(_) = self.activation_policy {
return Ok((self.account_id.clone(), None));
@@ -1205,7 +1333,7 @@ impl TendermintCoin {
.hd_wallet_derived_priv_key_or_err(&path_to_address)
.map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e.to_string()))?;
- let account_id = account_id_from_privkey(priv_key.as_slice(), &self.account_prefix)
+ let account_id = account_id_from_privkey(priv_key.as_slice(), &self.protocol_info.account_prefix)
.map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e.to_string()))?;
Ok((account_id, Some(priv_key)))
},
@@ -1220,7 +1348,7 @@ impl TendermintCoin {
}
}
- pub(super) fn any_to_transaction_data(
+ pub(super) async fn any_to_transaction_data(
&self,
maybe_priv_key: Option,
message: Any,
@@ -1234,19 +1362,34 @@ impl TendermintCoin {
let tx_bytes = tx_raw.to_bytes()?;
let hash = sha256(&tx_bytes);
- Ok(TransactionData::new_signed(
+ return Ok(TransactionData::new_signed(
tx_bytes.into(),
hex::encode_upper(hash.as_slice()),
- ))
+ ));
+ };
+
+ let SerializedUnsignedTx { tx_json, .. } = if self.is_ledger_connection() {
+ self.any_to_legacy_amino_json(account_info, message, fee, timeout_height, memo)
} else {
- let SerializedUnsignedTx { tx_json, .. } = if self.is_keplr_from_ledger {
- self.any_to_legacy_amino_json(account_info, message, fee, timeout_height, memo)
- } else {
- self.any_to_serialized_sign_doc(account_info, message, fee, timeout_height, memo)
- }?;
+ self.any_to_serialized_sign_doc(account_info, message, fee, timeout_height, memo)
+ }?;
- Ok(TransactionData::Unsigned(tx_json))
- }
+ if self.is_wallet_connect() {
+ let ctx = MmArc::from_weak(&self.ctx)
+ .ok_or(MyAddressError::InternalError(ERRL!("ctx must be initialized already")))?;
+ let wallet_connect = WalletConnectCtx::from_ctx(&ctx)?;
+
+ let tx_raw: Raw = self.wc_sign_tx(&wallet_connect, tx_json).await?.into();
+ let tx_bytes = tx_raw.to_bytes()?;
+ let hash = sha256(&tx_bytes);
+
+ return Ok(TransactionData::new_signed(
+ tx_bytes.into(),
+ hex::encode_upper(hash.as_slice()),
+ ));
+ };
+
+ Ok(TransactionData::Unsigned(tx_json))
}
fn gen_create_htlc_tx(
@@ -1260,10 +1403,10 @@ impl TendermintCoin {
let amount = vec![Coin { denom, amount }];
let timestamp = 0_u64;
- let htlc_type = HtlcType::from_str(&self.account_prefix).map_err(|_| {
+ let htlc_type = HtlcType::from_str(&self.protocol_info.account_prefix).map_err(|_| {
TxMarshalingErr::NotSupported(format!(
"Account type '{}' is not supported for HTLCs",
- self.account_prefix
+ self.protocol_info.account_prefix
))
})?;
@@ -1288,10 +1431,10 @@ impl TendermintCoin {
}
fn gen_claim_htlc_tx(&self, htlc_id: String, secret: &[u8]) -> MmResult {
- let htlc_type = HtlcType::from_str(&self.account_prefix).map_err(|_| {
+ let htlc_type = HtlcType::from_str(&self.protocol_info.account_prefix).map_err(|_| {
TxMarshalingErr::NotSupported(format!(
"Account type '{}' is not supported for HTLCs",
- self.account_prefix
+ self.protocol_info.account_prefix
))
})?;
@@ -1317,7 +1460,12 @@ impl TendermintCoin {
let signkey = SigningKey::from_slice(priv_key.as_slice())?;
let tx_body = tx::Body::new(vec![tx_payload], memo, timeout_height as u32);
let auth_info = SignerInfo::single_direct(Some(signkey.public_key()), account_info.sequence).auth_info(fee);
- let sign_doc = SignDoc::new(&tx_body, &auth_info, &self.chain_id, account_info.account_number)?;
+ let sign_doc = SignDoc::new(
+ &tx_body,
+ &auth_info,
+ &self.protocol_info.chain_id,
+ account_info.account_number,
+ )?;
sign_doc.sign(&signkey)
}
@@ -1332,16 +1480,40 @@ impl TendermintCoin {
let tx_body = tx::Body::new(vec![tx_payload], memo, timeout_height as u32);
let pubkey = self.activation_policy.public_key()?.into();
let auth_info = SignerInfo::single_direct(Some(pubkey), account_info.sequence).auth_info(fee);
- let sign_doc = SignDoc::new(&tx_body, &auth_info, &self.chain_id, account_info.account_number)?;
-
- let tx_json = json!({
- "sign_doc": {
- "body_bytes": sign_doc.body_bytes,
- "auth_info_bytes": sign_doc.auth_info_bytes,
- "chain_id": sign_doc.chain_id,
- "account_number": sign_doc.account_number,
- }
- });
+ let sign_doc = SignDoc::new(
+ &tx_body,
+ &auth_info,
+ &self.protocol_info.chain_id,
+ account_info.account_number,
+ )?;
+
+ let tx_json = if self.is_wallet_connect() {
+ let ctx = MmArc::from_weak(&self.ctx).expect("No context");
+ let wc = WalletConnectCtx::from_ctx(&ctx).expect("should never fail in this block");
+ let session_topic = self
+ .session_topic()
+ .expect("session_topic can't be None inside this block");
+ let encode = |data| wc.encode(session_topic, data);
+
+ json!({
+ "signerAddress": self.my_address()?,
+ "signDoc": {
+ "accountNumber": sign_doc.account_number.to_string(),
+ "chainId": sign_doc.chain_id,
+ "bodyBytes": encode(&sign_doc.body_bytes),
+ "authInfoBytes": encode(&sign_doc.auth_info_bytes)
+ }
+ })
+ } else {
+ json!({
+ "sign_doc": {
+ "body_bytes": &sign_doc.body_bytes,
+ "auth_info_bytes": sign_doc.auth_info_bytes,
+ "chain_id": sign_doc.chain_id,
+ "account_number": sign_doc.account_number,
+ }
+ })
+ };
Ok(SerializedUnsignedTx {
tx_json,
@@ -1349,7 +1521,7 @@ impl TendermintCoin {
})
}
- /// This should only be used for Keplr from Ledger!
+ /// This should only be used for Keplr/WalletConnect from Ledger!
/// When using Keplr from Ledger, they don't accept `SING_MODE_DIRECT` transactions.
///
/// Visit https://docs.cosmos.network/main/build/architecture/adr-050-sign-mode-textual#context for more context.
@@ -1377,8 +1549,6 @@ impl TendermintCoin {
let msg_send = MsgSend::from_any(&tx_payload)?;
let timeout_height = u32::try_from(timeout_height)?;
- let original_tx_type_url = tx_payload.type_url.clone();
- let body_bytes = tx::Body::new(vec![tx_payload], memo, timeout_height).into_bytes()?;
let amount: Vec = msg_send
.amount
@@ -1415,20 +1585,45 @@ impl TendermintCoin {
})
.collect();
- let tx_json = serde_json::json!({
- "legacy_amino_json": {
- "account_number": account_info.account_number.to_string(),
- "chain_id": self.chain_id.to_string(),
- "fee": {
- "amount": fee_amount,
- "gas": fee.gas_limit.to_string()
+ let sign_doc = json!({
+ "account_number": account_info.account_number.to_string(),
+ "chain_id": self.protocol_info.chain_id.to_string(),
+ "fee": {
+ "amount": fee_amount,
+ "gas": fee.gas_limit.to_string()
},
- "memo": memo,
- "msgs": [msg],
- "sequence": account_info.sequence.to_string(),
- },
- "original_tx_type_url": original_tx_type_url,
+ "memo": memo,
+ "msgs": [msg],
+ "sequence": account_info.sequence.to_string()
});
+ let (tx_json, body_bytes) = match self.wallet_type {
+ TendermintWalletConnectionType::WcLedger(_) => {
+ let signer_address = self
+ .my_address()
+ .map_err(|e| ErrorReport::new(io::Error::new(io::ErrorKind::Other, e.to_string())))?;
+ let body_bytes = tx::Body::new(vec![tx_payload], memo, timeout_height).into_bytes()?;
+ let json = serde_json::json!({
+ "signerAddress": signer_address,
+ "signDoc": sign_doc,
+ });
+ (json, body_bytes)
+ },
+ TendermintWalletConnectionType::KeplrLedger => {
+ let original_tx_type_url = tx_payload.type_url.clone();
+ let body_bytes = tx::Body::new(vec![tx_payload], memo, timeout_height).into_bytes()?;
+ let json = serde_json::json!({
+ "legacy_amino_json": sign_doc,
+ "original_tx_type_url": original_tx_type_url,
+ });
+ (json, body_bytes)
+ },
+ _ => {
+ return Err(ErrorReport::new(io::Error::new(
+ io::ErrorKind::InvalidInput,
+ "Only WalletConnect activated with Ledger can call this function",
+ )))
+ },
+ };
Ok(SerializedUnsignedTx { tx_json, body_bytes })
}
@@ -1461,7 +1656,10 @@ impl TendermintCoin {
}];
let pubkey_hash = dhash160(other_pub);
- let to_address = try_fus!(AccountId::new(&self.account_prefix, pubkey_hash.as_slice()));
+ let to_address = try_fus!(AccountId::new(
+ &self.protocol_info.account_prefix,
+ pubkey_hash.as_slice()
+ ));
let htlc_id = self.calculate_htlc_id(&self.account_id, &to_address, &amount, secret_hash);
@@ -1505,7 +1703,7 @@ impl TendermintCoin {
let deserialized_tx = try_s!(cosmrs::Tx::from_bytes(&tx.tx));
let msg = try_s!(deserialized_tx.body.messages.first().ok_or("Tx body couldn't be read."));
let htlc = try_s!(CreateHtlcProto::decode(
- try_s!(HtlcType::from_str(&coin.account_prefix)),
+ try_s!(HtlcType::from_str(&coin.protocol_info.account_prefix)),
msg.value.as_slice()
));
@@ -1537,7 +1735,10 @@ impl TendermintCoin {
decimals: u8,
) -> TransactionFut {
let pubkey_hash = dhash160(other_pub);
- let to = try_tx_fus!(AccountId::new(&self.account_prefix, pubkey_hash.as_slice()));
+ let to = try_tx_fus!(AccountId::new(
+ &self.protocol_info.account_prefix,
+ pubkey_hash.as_slice()
+ ));
let amount_as_u64 = try_tx_fus!(sat_from_big_decimal(&amount, decimals));
let amount = cosmrs::Amount::from(amount_as_u64);
@@ -1593,8 +1794,14 @@ impl TendermintCoin {
let from_address = self.account_id.clone();
let dex_pubkey_hash = dhash160(self.dex_pubkey());
let burn_pubkey_hash = dhash160(self.burn_pubkey());
- let dex_address = try_tx_fus!(AccountId::new(&self.account_prefix, dex_pubkey_hash.as_slice()));
- let burn_address = try_tx_fus!(AccountId::new(&self.account_prefix, burn_pubkey_hash.as_slice()));
+ let dex_address = try_tx_fus!(AccountId::new(
+ &self.protocol_info.account_prefix,
+ dex_pubkey_hash.as_slice()
+ ));
+ let burn_address = try_tx_fus!(AccountId::new(
+ &self.protocol_info.account_prefix,
+ burn_pubkey_hash.as_slice()
+ ));
let fee_amount_as_u64 = try_tx_fus!(dex_fee.fee_amount_as_u64(decimals));
let fee_amount = vec![Coin {
@@ -1695,8 +1902,11 @@ impl TendermintCoin {
.to_string();
let sender_pubkey_hash = dhash160(expected_sender);
- let expected_sender_address = try_f!(AccountId::new(&self.account_prefix, sender_pubkey_hash.as_slice())
- .map_to_mm(|r| ValidatePaymentError::InvalidParameter(r.to_string())));
+ let expected_sender_address = try_f!(AccountId::new(
+ &self.protocol_info.account_prefix,
+ sender_pubkey_hash.as_slice()
+ )
+ .map_to_mm(|r| ValidatePaymentError::InvalidParameter(r.to_string())));
let coin = self.clone();
let dex_fee = dex_fee.clone();
@@ -1764,10 +1974,10 @@ impl TendermintCoin {
"Payment tx must have exactly one message".into(),
));
}
- let htlc_type = HtlcType::from_str(&self.account_prefix).map_err(|_| {
+ let htlc_type = HtlcType::from_str(&self.protocol_info.account_prefix).map_err(|_| {
ValidatePaymentError::InvalidParameter(format!(
"Account type '{}' is not supported for HTLCs",
- self.account_prefix
+ self.protocol_info.account_prefix
))
})?;
@@ -1777,7 +1987,7 @@ impl TendermintCoin {
.map_to_mm(|e| ValidatePaymentError::WrongPaymentTx(e.to_string()))?;
let sender_pubkey_hash = dhash160(&input.other_pub);
- let sender = AccountId::new(&self.account_prefix, sender_pubkey_hash.as_slice())
+ let sender = AccountId::new(&self.protocol_info.account_prefix, sender_pubkey_hash.as_slice())
.map_to_mm(|e| ValidatePaymentError::InvalidParameter(e.to_string()))?;
let amount = sat_from_big_decimal(&input.amount, decimals)?;
@@ -1844,7 +2054,7 @@ impl TendermintCoin {
}
let dex_pubkey_hash = dhash160(self.dex_pubkey());
- let expected_dex_address = AccountId::new(&self.account_prefix, dex_pubkey_hash.as_slice())
+ let expected_dex_address = AccountId::new(&self.protocol_info.account_prefix, dex_pubkey_hash.as_slice())
.map_to_mm(|r| ValidatePaymentError::InvalidParameter(r.to_string()))?;
let fee_amount_as_u64 = dex_fee.fee_amount_as_u64(decimals)?;
@@ -1896,11 +2106,11 @@ impl TendermintCoin {
}
let dex_pubkey_hash = dhash160(self.dex_pubkey());
- let expected_dex_address = AccountId::new(&self.account_prefix, dex_pubkey_hash.as_slice())
+ let expected_dex_address = AccountId::new(&self.protocol_info.account_prefix, dex_pubkey_hash.as_slice())
.map_to_mm(|r| ValidatePaymentError::InvalidParameter(r.to_string()))?;
let burn_pubkey_hash = dhash160(self.burn_pubkey());
- let expected_burn_address = AccountId::new(&self.account_prefix, burn_pubkey_hash.as_slice())
+ let expected_burn_address = AccountId::new(&self.protocol_info.account_prefix, burn_pubkey_hash.as_slice())
.map_to_mm(|r| ValidatePaymentError::InvalidParameter(r.to_string()))?;
let fee_amount_as_u64 = dex_fee.fee_amount_as_u64(decimals)?;
@@ -1988,7 +2198,7 @@ impl TendermintCoin {
common::os_rng(&mut sec).map_err(|e| MmError::new(TradePreimageError::InternalError(e.to_string())))?;
drop_mutability!(sec);
- let to_address = account_id_from_pubkey_hex(&self.account_prefix, DEX_FEE_ADDR_PUBKEY)
+ let to_address = account_id_from_pubkey_hex(&self.protocol_info.account_prefix, DEX_FEE_ADDR_PUBKEY)
.map_err(|e| MmError::new(TradePreimageError::InternalError(e.to_string())))?;
let amount = sat_from_big_decimal(&amount, decimals)?;
@@ -2022,7 +2232,7 @@ impl TendermintCoin {
)
.await?;
- let fee_amount = big_decimal_from_sat_unsigned(fee_uamount, self.decimals);
+ let fee_amount = big_decimal_from_sat_unsigned(fee_uamount, self.protocol_info.decimals);
Ok(TradeFee {
coin: ticker,
@@ -2038,7 +2248,7 @@ impl TendermintCoin {
decimals: u8,
dex_fee_amount: DexFee,
) -> TradePreimageResult {
- let to_address = account_id_from_pubkey_hex(&self.account_prefix, DEX_FEE_ADDR_PUBKEY)
+ let to_address = account_id_from_pubkey_hex(&self.protocol_info.account_prefix, DEX_FEE_ADDR_PUBKEY)
.map_err(|e| MmError::new(TradePreimageError::InternalError(e.to_string())))?;
let amount = sat_from_big_decimal(&dex_fee_amount.fee_amount().into(), decimals)?;
@@ -2147,10 +2357,11 @@ impl TendermintCoin {
}
pub(crate) async fn query_htlc(&self, id: String) -> MmResult {
- let htlc_type =
- HtlcType::from_str(&self.account_prefix).map_err(|_| TendermintCoinRpcError::UnexpectedAccountType {
- prefix: self.account_prefix.clone(),
- })?;
+ let htlc_type = HtlcType::from_str(&self.protocol_info.account_prefix).map_err(|_| {
+ TendermintCoinRpcError::UnexpectedAccountType {
+ prefix: self.protocol_info.account_prefix.clone(),
+ }
+ })?;
let request = QueryHtlcRequestProto { id };
let response = self
@@ -2184,10 +2395,11 @@ impl TendermintCoin {
.first()
.or_mm_err(|| SearchForSwapTxSpendErr::TxMessagesEmpty)?;
- let htlc_type =
- HtlcType::from_str(&self.account_prefix).map_err(|_| SearchForSwapTxSpendErr::UnexpectedAccountType {
- prefix: self.account_prefix.clone(),
- })?;
+ let htlc_type = HtlcType::from_str(&self.protocol_info.account_prefix).map_err(|_| {
+ SearchForSwapTxSpendErr::UnexpectedAccountType {
+ prefix: self.protocol_info.account_prefix.clone(),
+ }
+ })?;
let htlc_proto = CreateHtlcProto::decode(htlc_type, first_message.value.as_slice())?;
let htlc = CreateHtlcMsg::try_from(htlc_proto)?;
@@ -2255,8 +2467,8 @@ impl TendermintCoin {
}
pub(crate) fn active_ticker_and_decimals_from_denom(&self, denom: &str) -> Option<(String, u8)> {
- if self.denom.as_ref() == denom {
- return Some((self.ticker.clone(), self.decimals));
+ if self.protocol_info.denom.as_ref() == denom {
+ return Some((self.ticker.clone(), self.protocol_info.decimals));
}
let tokens = self.tokens_info.lock();
@@ -2268,6 +2480,22 @@ impl TendermintCoin {
None
}
+ #[inline]
+ pub fn is_ledger_connection(&self) -> bool {
+ matches!(
+ self.wallet_type,
+ TendermintWalletConnectionType::WcLedger(_) | TendermintWalletConnectionType::KeplrLedger
+ )
+ }
+
+ #[inline]
+ pub fn is_wallet_connect(&self) -> bool {
+ matches!(
+ self.wallet_type,
+ TendermintWalletConnectionType::WcLedger(_) | TendermintWalletConnectionType::Wc(_)
+ )
+ }
+
pub(crate) async fn validators_list(
&self,
filter_status: ValidatorStatus,
@@ -2350,7 +2578,7 @@ impl TendermintCoin {
return Err(not_sufficient(total));
}
- let amount_u64 = sat_from_big_decimal(&request_amount, coin.decimals)
+ let amount_u64 = sat_from_big_decimal(&request_amount, coin.protocol_info.decimals)
.map_err(|e| DelegationError::InternalError(e.to_string()))?;
Ok((amount_u64, total))
@@ -2364,13 +2592,13 @@ impl TendermintCoin {
.map_err(|e| DelegationError::InternalError(e.to_string()))?;
let (balance_u64, balance_dec) = self
- .get_balance_as_unsigned_and_decimal(&delegator_address, &self.denom, self.decimals())
+ .get_balance_as_unsigned_and_decimal(&delegator_address, &self.protocol_info.denom, self.decimals())
.await?;
let amount_u64 = if req.max {
balance_u64
} else {
- sat_from_big_decimal(&req.amount, self.decimals)
+ sat_from_big_decimal(&req.amount, self.protocol_info.decimals)
.map_err(|e| DelegationError::InternalError(e.to_string()))?
};
@@ -2378,7 +2606,7 @@ impl TendermintCoin {
let msg_for_fee_prediction = generate_message(
delegator_address.clone(),
validator_address.clone(),
- self.denom.clone(),
+ self.protocol_info.denom.clone(),
amount_u64.into(),
)
.map_err(|e| DelegationError::InternalError(e.to_string()))?;
@@ -2409,7 +2637,7 @@ impl TendermintCoin {
let fee = Fee::from_amount_and_gas(
Coin {
- denom: self.denom.clone(),
+ denom: self.protocol_info.denom.clone(),
amount: fee_amount_u64.into(),
},
gas_limit,
@@ -2428,7 +2656,7 @@ impl TendermintCoin {
let msg_for_actual_tx = generate_message(
delegator_address.clone(),
validator_address.clone(),
- self.denom.clone(),
+ self.protocol_info.denom.clone(),
amount_u64.into(),
)
.map_err(|e| DelegationError::InternalError(e.to_string()))?;
@@ -2444,12 +2672,10 @@ impl TendermintCoin {
timeout_height,
&req.memo,
)
+ .await
.map_to_mm(|e| DelegationError::InternalError(e.to_string()))?;
- let internal_id = {
- let hex_vec = tx.tx_hex().cloned().unwrap_or_default().to_vec();
- sha256(&hex_vec).to_vec().into()
- };
+ let internal_id = tendermint_tx_internal_id(tx.tx_hash().unwrap_or_default().as_bytes(), None);
Ok(TransactionDetails {
tx,
@@ -2509,14 +2735,14 @@ impl TendermintCoin {
});
};
- sat_from_big_decimal(&req.amount, self.decimals)
+ sat_from_big_decimal(&req.amount, self.protocol_info.decimals)
.map_err(|e| DelegationError::InternalError(e.to_string()))?
};
let undelegate_msg = generate_message(
delegator_address.clone(),
validator_address.clone(),
- self.denom.clone(),
+ self.protocol_info.denom.clone(),
uamount_to_undelegate.into(),
)
.map_err(|e| DelegationError::InternalError(e.to_string()))?;
@@ -2557,7 +2783,7 @@ impl TendermintCoin {
let fee = Fee::from_amount_and_gas(
Coin {
- denom: self.denom.clone(),
+ denom: self.protocol_info.denom.clone(),
amount: fee_amount_u64.into(),
},
gas_limit,
@@ -2574,12 +2800,10 @@ impl TendermintCoin {
timeout_height,
&req.memo,
)
+ .await
.map_to_mm(|e| DelegationError::InternalError(e.to_string()))?;
- let internal_id = {
- let hex_vec = tx.tx_hex().map_or_else(Vec::new, |h| h.to_vec());
- sha256(&hex_vec).to_vec().into()
- };
+ let internal_id = tendermint_tx_internal_id(tx.tx_hash().unwrap_or_default().as_bytes(), None);
Ok(TransactionDetails {
tx,
@@ -2684,9 +2908,9 @@ impl TendermintCoin {
match decoded_response
.rewards
.iter()
- .find(|t| t.denom == self.denom.to_string())
+ .find(|t| t.denom == self.protocol_info.denom.to_string())
{
- Some(dec_coin) => extract_big_decimal_from_dec_coin(dec_coin, self.decimals as u32)
+ Some(dec_coin) => extract_big_decimal_from_dec_coin(dec_coin, self.protocol_info.decimals as u32)
.map_to_mm(|e| DelegationError::InternalError(e.to_string())),
None => MmError::err(DelegationError::NothingToClaim {
coin: self.ticker.clone(),
@@ -2763,7 +2987,7 @@ impl TendermintCoin {
let fee = Fee::from_amount_and_gas(
Coin {
- denom: self.denom.clone(),
+ denom: self.protocol_info.denom.clone(),
amount: fee_amount_u64.into(),
},
gas_limit,
@@ -2773,12 +2997,10 @@ impl TendermintCoin {
let tx = self
.any_to_transaction_data(maybe_priv_key, msg, &account_info, fee, timeout_height, &req.memo)
+ .await
.map_to_mm(|e| DelegationError::InternalError(e.to_string()))?;
- let internal_id = {
- let hex_vec = tx.tx_hex().map_or_else(Vec::new, |h| h.to_vec());
- sha256(&hex_vec).to_vec().into()
- };
+ let internal_id = tendermint_tx_internal_id(tx.tx_hash().unwrap_or_default().as_bytes(), None);
Ok(TransactionDetails {
tx,
@@ -2955,51 +3177,38 @@ fn clients_from_urls(ctx: &MmArc, nodes: Vec) -> MmResult IBCChainRegistriesResult {
- fn map_metadata_to_chain_registry_name(metadata: &FileMetadata) -> Result> {
- let split_filename_by_dash: Vec<&str> = metadata.name.split('-').collect();
- let chain_registry_name = split_filename_by_dash
- .first()
- .or_mm_err(|| {
- IBCChainsRequestError::InternalError(format!(
- "Could not read chain registry name from '{}'",
- metadata.name
- ))
- })?
- .to_string();
-
- Ok(chain_registry_name)
- }
-
- let git_controller: GitController = GitController::new(GITHUB_API_URI);
-
- let metadata_list = git_controller
- .client
- .get_file_metadata_list(
- CHAIN_REGISTRY_REPO_OWNER,
- CHAIN_REGISTRY_REPO_NAME,
- CHAIN_REGISTRY_BRANCH,
- CHAIN_REGISTRY_IBC_DIR_NAME,
- )
- .await
- .map_err(|e| IBCChainsRequestError::Transport(format!("{:?}", e)))?;
-
- let chain_list: Result, MmError> =
- metadata_list.iter().map(map_metadata_to_chain_registry_name).collect();
-
- let mut distinct_chain_list = chain_list?;
- distinct_chain_list.dedup();
-
- Ok(IBCChainRegistriesResponse {
- chain_registry_list: distinct_chain_list,
- })
-}
-
#[async_trait]
#[allow(unused_variables)]
impl MmCoin for TendermintCoin {
fn is_asset_chain(&self) -> bool { false }
+ #[cfg(feature = "ibc-routing-for-swaps")]
+ fn wallet_only(&self, ctx: &MmArc) -> bool {
+ // Keplr with Ledger does not support some transactions like HTLC due to
+ // the transaction format they use. As HTLC is part of our swap system's DNA,
+ // treat any Tendermint asset as wallet-only.
+ //
+ // TODO: Once `SIGN_MODE_DIRECT` is supported, we can remove this.
+ if self.is_ledger_connection() {
+ common::log::info!("Using Keplr with Ledger: operating in wallet only mode.");
+ return true;
+ }
+
+ let coin_conf = crate::coin_conf(ctx, self.ticker());
+ let wallet_only_conf = coin_conf
+ .get("wallet_only")
+ .unwrap_or(&json!(false))
+ .as_bool()
+ .unwrap_or(false);
+
+ if wallet_only_conf {
+ warn!("`wallet_only` option cannot be set to true for Tendermint assets. This setting will be ignored.");
+ }
+
+ false
+ }
+
+ #[cfg(not(feature = "ibc-routing-for-swaps"))]
fn wallet_only(&self, ctx: &MmArc) -> bool {
let coin_conf = crate::coin_conf(ctx, self.ticker());
// If coin is not in config, it means that it was added manually (a custom token) and should be treated as wallet only
@@ -3008,7 +3217,7 @@ impl MmCoin for TendermintCoin {
}
let wallet_only_conf = coin_conf["wallet_only"].as_bool().unwrap_or(false);
- wallet_only_conf || self.is_keplr_from_ledger
+ wallet_only_conf || self.is_ledger_connection()
}
fn spawner(&self) -> WeakSpawner { self.abortable_system.weak_spawner() }
@@ -3019,24 +3228,28 @@ impl MmCoin for TendermintCoin {
let to_address =
AccountId::from_str(&req.to).map_to_mm(|e| WithdrawError::InvalidAddress(e.to_string()))?;
- let is_ibc_transfer = to_address.prefix() != coin.account_prefix || req.ibc_source_channel.is_some();
+ let is_ibc_transfer =
+ to_address.prefix() != coin.protocol_info.account_prefix || req.ibc_source_channel.is_some();
let (account_id, maybe_priv_key) = coin
.extract_account_id_and_private_key(req.from)
.map_err(|e| WithdrawError::InternalError(e.to_string()))?;
let (balance_denom, balance_dec) = coin
- .get_balance_as_unsigned_and_decimal(&account_id, &coin.denom, coin.decimals())
+ .get_balance_as_unsigned_and_decimal(&account_id, &coin.protocol_info.denom, coin.decimals())
.await?;
let (amount_denom, amount_dec) = if req.max {
let amount_denom = balance_denom;
- (amount_denom, big_decimal_from_sat_unsigned(amount_denom, coin.decimals))
+ (
+ amount_denom,
+ big_decimal_from_sat_unsigned(amount_denom, coin.decimals()),
+ )
} else {
- (sat_from_big_decimal(&req.amount, coin.decimals)?, req.amount.clone())
+ (sat_from_big_decimal(&req.amount, coin.decimals())?, req.amount.clone())
};
- if !coin.is_tx_amount_enough(coin.decimals, &amount_dec) {
+ if !coin.is_tx_amount_enough(coin.decimals(), &amount_dec) {
return MmError::err(WithdrawError::AmountTooLow {
amount: amount_dec,
threshold: coin.min_tx_amount(),
@@ -3052,7 +3265,10 @@ impl MmCoin for TendermintCoin {
let channel_id = if is_ibc_transfer {
match &req.ibc_source_channel {
Some(_) => req.ibc_source_channel,
- None => Some(coin.detect_channel_id_for_ibc_transfer(&to_address).await?),
+ None => Some(
+ coin.get_healthy_ibc_channel_for_address_prefix(to_address.prefix())
+ .await?,
+ ),
}
} else {
None
@@ -3061,9 +3277,9 @@ impl MmCoin for TendermintCoin {
let msg_payload = create_withdraw_msg_as_any(
account_id.clone(),
to_address.clone(),
- &coin.denom,
+ &coin.protocol_info.denom,
amount_denom,
- channel_id.clone(),
+ channel_id,
)
.await?;
@@ -3094,13 +3310,15 @@ impl MmCoin for TendermintCoin {
)
.await?;
- let fee_amount_u64 = if coin.is_keplr_from_ledger {
+ let fee_amount_u64 = if coin.is_ledger_connection() {
// When using `SIGN_MODE_LEGACY_AMINO_JSON`, Keplr ignores the fee we calculated
// and calculates another one which is usually double what we calculate.
// To make sure the transaction doesn't fail on the Keplr side (because if Keplr
// calculates a higher fee than us, the withdrawal might fail), we use three times
// the actual fee.
fee_amount_u64 * 3
+ } else if is_ibc_transfer {
+ fee_amount_u64 * 3 / 2
} else {
fee_amount_u64
};
@@ -3108,7 +3326,7 @@ impl MmCoin for TendermintCoin {
let fee_amount_dec = big_decimal_from_sat_unsigned(fee_amount_u64, coin.decimals());
let fee_amount = Coin {
- denom: coin.denom.clone(),
+ denom: coin.protocol_info.denom.clone(),
amount: fee_amount_u64.into(),
};
@@ -3134,13 +3352,13 @@ impl MmCoin for TendermintCoin {
});
}
- (sat_from_big_decimal(&req.amount, coin.decimals)?, total)
+ (sat_from_big_decimal(&req.amount, coin.decimals())?, total)
};
let msg_payload = create_withdraw_msg_as_any(
account_id.clone(),
to_address.clone(),
- &coin.denom,
+ &coin.protocol_info.denom,
amount_denom,
channel_id,
)
@@ -3150,12 +3368,10 @@ impl MmCoin for TendermintCoin {
let tx = coin
.any_to_transaction_data(maybe_priv_key, msg_payload, &account_info, fee, timeout_height, &memo)
+ .await
.map_to_mm(|e| WithdrawError::InternalError(e.to_string()))?;
- let internal_id = {
- let hex_vec = tx.tx_hex().cloned().unwrap_or_default().to_vec();
- sha256(&hex_vec).to_vec().into()
- };
+ let internal_id = tendermint_tx_internal_id(tx.tx_hash().unwrap_or_default().as_bytes(), None);
Ok(TransactionDetails {
tx,
@@ -3215,7 +3431,7 @@ impl MmCoin for TendermintCoin {
Box::new(fut.boxed().compat())
}
- fn decimals(&self) -> u8 { self.decimals }
+ fn decimals(&self) -> u8 { self.protocol_info.decimals }
fn convert_to_address(&self, from: &str, to_address_format: Json) -> Result {
// TODO
@@ -3255,8 +3471,129 @@ impl MmCoin for TendermintCoin {
let amount = match value {
TradePreimageValue::Exact(decimal) | TradePreimageValue::UpperBound(decimal) => decimal,
};
- self.get_sender_trade_fee_for_denom(self.ticker.clone(), self.denom.clone(), self.decimals, amount)
+ self.get_sender_trade_fee_for_denom(
+ self.ticker.clone(),
+ self.protocol_info.denom.clone(),
+ self.protocol_info.decimals,
+ amount,
+ )
+ .await
+ }
+
+ /// Overrides the default `pre_check_for_order_creation` implementation with
+ /// additional IBC-related logic on top of the default behavior.
+ #[cfg(feature = "ibc-routing-for-swaps")]
+ async fn pre_check_for_order_creation(
+ &self,
+ ctx: &MmArc,
+ rel_coin: &crate::MmCoinEnum,
+ ) -> MmResult<(), crate::OrderCreationPreCheckError> {
+ use crate::{lp_coinfind, MmCoinEnum, OrderCreationPreCheckError};
+
+ /// Looks for a Tendermint platform coin by the given ticker.
+ ///
+ /// Returns `Ok(Some(...))` if the coin exists and is a Tendermint platform coin,
+ /// `Ok(None)` if it's not active, or an error if somethings goes wrong or the ticker
+ /// isn't belongs to a Tendermint platform coin.
+ async fn find_tendermint_platform_coin(
+ ctx: &MmArc,
+ ticker: &str,
+ ) -> Result, MmError> {
+ match lp_coinfind(ctx, ticker).await {
+ Ok(Some(MmCoinEnum::Tendermint(coin))) => Ok(Some(coin)),
+ Ok(Some(other)) => MmError::err(OrderCreationPreCheckError::InternalError {
+ reason: format!(
+ "Expected a Tendermint coin for '{}', but found '{}'.",
+ ticker,
+ other.ticker()
+ ),
+ }),
+ Ok(None) => Ok(None),
+ Err(reason) => MmError::err(OrderCreationPreCheckError::PreCheckFailed { reason }),
+ }
+ }
+
+ /// Picks an HTLC coin (IRIS or NUCLEUS) based on which IBC channel is configured
+ /// and is healthy.
+ async fn get_htlc_coin(
+ coin: &TendermintCoin,
+ ctx: &MmArc,
+ ) -> Result, MmError> {
+ const IRIS_TICKER: &str = "IRIS";
+ const NUCLEUS_TICKER: &str = "NUCLEUS";
+
+ if coin
+ .get_healthy_ibc_channel_for_address_prefix(IRIS_PREFIX)
+ .await
+ .is_ok()
+ {
+ return find_tendermint_platform_coin(ctx, IRIS_TICKER).await;
+ }
+
+ if coin
+ .get_healthy_ibc_channel_for_address_prefix(NUCLEUS_PREFIX)
+ .await
+ .is_ok()
+ {
+ return find_tendermint_platform_coin(ctx, NUCLEUS_TICKER).await;
+ }
+
+ MmError::err(OrderCreationPreCheckError::PreCheckFailed {
+ reason: format!("No healthy IBC channel found for {}.", coin.ticker()),
+ })
+ }
+
+ if self.wallet_only(ctx) {
+ return MmError::err(OrderCreationPreCheckError::IsWalletOnly {
+ ticker: self.ticker().to_owned(),
+ });
+ }
+
+ if rel_coin.wallet_only(ctx) {
+ return MmError::err(OrderCreationPreCheckError::IsWalletOnly {
+ ticker: rel_coin.ticker().to_owned(),
+ });
+ }
+
+ if self.supports_htlc() {
+ return Ok(());
+ }
+
+ // If `self` is not an HTLC-supported coin, we need to check a few things when creating the order:
+ // - Is there an HTLC coin enabled?
+ // - Does that HTLC network have an IBC channel configured to `self` network?
+ // - Does that HTLC coin have enough balance to handle IBC routing?
+
+ let Some(htlc_coin) = get_htlc_coin(self, ctx).await? else {
+ return MmError::err(OrderCreationPreCheckError::PreCheckFailed {
+ reason: "No HTLC coin is currently enabled. Please enable either Iris or Nucleus.".into(),
+ });
+ };
+
+ let my_balance = htlc_coin
+ .my_balance()
+ .compat()
.await
+ .map_err(|e| OrderCreationPreCheckError::InternalError { reason: e.to_string() })?
+ .spendable;
+
+ let min_balance_for_ibc_routing = htlc_coin
+ .protocol_info
+ .min_balance_for_ibc_routing
+ .unwrap_or(DEFAULT_MIN_BALANCE_FOR_IBC_ROUTING);
+ let min_balance_for_ibc_routing = BigDecimal::try_from(min_balance_for_ibc_routing)
+ .map_err(|e| OrderCreationPreCheckError::InternalError { reason: e.to_string() })?;
+
+ if min_balance_for_ibc_routing > my_balance {
+ let htlc_ticker = htlc_coin.ticker();
+ let self_ticker = self.ticker();
+ let reason = format!(
+ "Insufficient balance on HTLC coin ({htlc_ticker}) for making orders with {self_ticker}. Minimum required expected balance {min_balance_for_ibc_routing}, current balance {my_balance}.",
+ );
+ return MmError::err(OrderCreationPreCheckError::PreCheckFailed { reason });
+ }
+
+ Ok(())
}
fn get_receiver_trade_fee(&self, stage: FeeApproxStage) -> TradePreimageFut {
@@ -3266,8 +3603,8 @@ impl MmCoin for TendermintCoin {
// Since create and claim htlc fees are almost same, we can simply simulate create htlc tx.
coin.get_sender_trade_fee_for_denom(
coin.ticker.clone(),
- coin.denom.clone(),
- coin.decimals,
+ coin.protocol_info.denom.clone(),
+ coin.decimals(),
coin.min_tx_amount(),
)
.await
@@ -3280,8 +3617,13 @@ impl MmCoin for TendermintCoin {
dex_fee_amount: DexFee,
_stage: FeeApproxStage,
) -> TradePreimageResult {
- self.get_fee_to_send_taker_fee_for_denom(self.ticker.clone(), self.denom.clone(), self.decimals, dex_fee_amount)
- .await
+ self.get_fee_to_send_taker_fee_for_denom(
+ self.ticker.clone(),
+ self.protocol_info.denom.clone(),
+ self.protocol_info.decimals,
+ dex_fee_amount,
+ )
+ .await
}
fn required_confirmations(&self) -> u64 { 0 }
@@ -3323,6 +3665,12 @@ impl MarketCoinOps for TendermintCoin {
fn my_address(&self) -> MmResult { Ok(self.account_id.to_string()) }
+ fn address_from_pubkey(&self, pubkey: &H264Json) -> MmResult {
+ let address = account_id_from_raw_pubkey(&self.protocol_info.account_prefix, &pubkey.0)
+ .map_err(|e| AddressFromPubkeyError::InternalError(e.to_string()))?;
+ Ok(address.to_string())
+ }
+
async fn get_public_key(&self) -> Result> {
let key = SigningKey::from_slice(self.activation_policy.activated_key_or_err()?.as_slice())
.expect("privkey validity is checked on coin creation");
@@ -3334,7 +3682,7 @@ impl MarketCoinOps for TendermintCoin {
None
}
- fn sign_message(&self, _message: &str) -> SignatureResult {
+ fn sign_message(&self, _message: &str, _address: Option) -> SignatureResult {
// TODO
MmError::err(SignatureError::InternalError("Not implemented".into()))
}
@@ -3348,10 +3696,10 @@ impl MarketCoinOps for TendermintCoin {
let coin = self.clone();
let fut = async move {
let balance_denom = coin
- .account_balance_for_denom(&coin.account_id, coin.denom.to_string())
+ .account_balance_for_denom(&coin.account_id, coin.protocol_info.denom.to_string())
.await?;
Ok(CoinBalance {
- spendable: big_decimal_from_sat_unsigned(balance_denom, coin.decimals),
+ spendable: big_decimal_from_sat_unsigned(balance_denom, coin.decimals()),
unspendable: BigDecimal::default(),
})
};
@@ -3369,7 +3717,7 @@ impl MarketCoinOps for TendermintCoin {
self.send_raw_tx_bytes(&tx_bytes)
}
- /// Consider using `seq_safe_raw_tx_bytes` instead.
+ /// Consider using `seq_safe_send_raw_tx_bytes` instead.
/// This is considered as unsafe due to sequence mismatches.
fn send_raw_tx_bytes(&self, tx: &[u8]) -> Box + Send> {
// as sanity check
@@ -3450,7 +3798,7 @@ impl MarketCoinOps for TendermintCoin {
let tx = try_tx_s!(cosmrs::Tx::from_bytes(args.tx_bytes));
let first_message = try_tx_s!(tx.body.messages.first().ok_or("Tx body couldn't be read."));
let htlc_proto = try_tx_s!(CreateHtlcProto::decode(
- try_tx_s!(HtlcType::from_str(&self.account_prefix)),
+ try_tx_s!(HtlcType::from_str(&self.protocol_info.account_prefix)),
first_message.value.as_slice()
));
let htlc = try_tx_s!(CreateHtlcMsg::try_from(htlc_proto));
@@ -3509,7 +3857,7 @@ impl MarketCoinOps for TendermintCoin {
}
#[inline]
- fn min_tx_amount(&self) -> BigDecimal { big_decimal_from_sat(MIN_TX_SATOSHIS, self.decimals) }
+ fn min_tx_amount(&self) -> BigDecimal { big_decimal_from_sat(MIN_TX_SATOSHIS, self.protocol_info.decimals) }
#[inline]
fn min_trading_vol(&self) -> MmNumber { self.min_tx_amount().into() }
@@ -3529,9 +3877,15 @@ impl MarketCoinOps for TendermintCoin {
#[allow(unused_variables)]
impl SwapOps for TendermintCoin {
async fn send_taker_fee(&self, dex_fee: DexFee, uuid: &[u8], expire_at: u64) -> TransactionResult {
- self.send_taker_fee_for_denom(&dex_fee, self.denom.clone(), self.decimals, uuid, expire_at)
- .compat()
- .await
+ self.send_taker_fee_for_denom(
+ &dex_fee,
+ self.protocol_info.denom.clone(),
+ self.protocol_info.decimals,
+ uuid,
+ expire_at,
+ )
+ .compat()
+ .await
}
async fn send_maker_payment(&self, maker_payment_args: SendPaymentArgs<'_>) -> TransactionResult {
@@ -3540,8 +3894,8 @@ impl SwapOps for TendermintCoin {
maker_payment_args.other_pubkey,
maker_payment_args.secret_hash,
maker_payment_args.amount,
- self.denom.clone(),
- self.decimals,
+ self.protocol_info.denom.clone(),
+ self.protocol_info.decimals,
)
.compat()
.await
@@ -3553,8 +3907,8 @@ impl SwapOps for TendermintCoin {
taker_payment_args.other_pubkey,
taker_payment_args.secret_hash,
taker_payment_args.amount,
- self.denom.clone(),
- self.decimals,
+ self.protocol_info.denom.clone(),
+ self.protocol_info.decimals,
)
.compat()
.await
@@ -3573,7 +3927,7 @@ impl SwapOps for TendermintCoin {
let msg = try_tx_s!(tx.body.messages.first().ok_or("Tx body couldn't be read."));
let htlc_proto = try_tx_s!(CreateHtlcProto::decode(
- try_tx_s!(HtlcType::from_str(&self.account_prefix)),
+ try_tx_s!(HtlcType::from_str(&self.protocol_info.account_prefix)),
msg.value.as_slice()
));
let htlc = try_tx_s!(CreateHtlcMsg::try_from(htlc_proto));
@@ -3629,7 +3983,7 @@ impl SwapOps for TendermintCoin {
let msg = try_tx_s!(tx.body.messages.first().ok_or("Tx body couldn't be read."));
let htlc_proto = try_tx_s!(CreateHtlcProto::decode(
- try_tx_s!(HtlcType::from_str(&self.account_prefix)),
+ try_tx_s!(HtlcType::from_str(&self.protocol_info.account_prefix)),
msg.value.as_slice()
));
let htlc = try_tx_s!(CreateHtlcMsg::try_from(htlc_proto));
@@ -3694,21 +4048,21 @@ impl SwapOps for TendermintCoin {
validate_fee_args.fee_tx,
validate_fee_args.expected_sender,
validate_fee_args.dex_fee,
- self.decimals,
+ self.protocol_info.decimals,
validate_fee_args.uuid,
- self.denom.to_string(),
+ self.protocol_info.denom.to_string(),
)
.compat()
.await
}
async fn validate_maker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentResult<()> {
- self.validate_payment_for_denom(input, self.denom.clone(), self.decimals)
+ self.validate_payment_for_denom(input, self.protocol_info.denom.clone(), self.protocol_info.decimals)
.await
}
async fn validate_taker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentResult<()> {
- self.validate_payment_for_denom(input, self.denom.clone(), self.decimals)
+ self.validate_payment_for_denom(input, self.protocol_info.denom.clone(), self.protocol_info.decimals)
.await
}
@@ -3717,8 +4071,8 @@ impl SwapOps for TendermintCoin {
if_my_payment_sent_args: CheckIfMyPaymentSentArgs<'_>,
) -> Result, String> {
self.check_if_my_payment_sent_for_denom(
- self.decimals,
- self.denom.clone(),
+ self.protocol_info.decimals,
+ self.protocol_info.denom.clone(),
if_my_payment_sent_args.other_pub,
if_my_payment_sent_args.secret_hash,
if_my_payment_sent_args.amount,
@@ -3751,7 +4105,7 @@ impl SwapOps for TendermintCoin {
let msg = try_s!(tx.body.messages.first().ok_or("Tx body couldn't be read."));
let htlc_proto = try_s!(ClaimHtlcProto::decode(
- try_s!(HtlcType::from_str(&self.account_prefix)),
+ try_s!(HtlcType::from_str(&self.protocol_info.account_prefix)),
msg.value.as_slice()
));
let htlc = try_s!(ClaimHtlcMsg::try_from(htlc_proto));
@@ -3858,54 +4212,15 @@ pub fn tendermint_priv_key_policy(
}
}
-pub(crate) fn chain_registry_name_from_account_prefix(ctx: &MmArc, prefix: &str) -> Option {
- let Some(coins) = ctx.conf["coins"].as_array() else {
- return None;
- };
-
- for coin in coins {
- let protocol = coin
- .get("protocol")
- .unwrap_or(&serde_json::Value::Null)
- .get("type")
- .unwrap_or(&serde_json::Value::Null)
- .as_str();
-
- if protocol != Some(TENDERMINT_COIN_PROTOCOL_TYPE) {
- continue;
- }
-
- let coin_account_prefix = coin
- .get("protocol")
- .unwrap_or(&serde_json::Value::Null)
- .get("protocol_data")
- .unwrap_or(&serde_json::Value::Null)
- .get("account_prefix")
- .map(|t| t.as_str().unwrap_or_default());
-
- if coin_account_prefix == Some(prefix) {
- return coin
- .get("protocol")
- .unwrap_or(&serde_json::Value::Null)
- .get("protocol_data")
- .unwrap_or(&serde_json::Value::Null)
- .get("chain_registry_name")
- .map(|t| t.as_str().unwrap_or_default().to_owned());
- }
- }
-
- None
-}
-
pub(crate) async fn create_withdraw_msg_as_any(
sender: AccountId,
receiver: AccountId,
denom: &Denom,
amount: u64,
- ibc_source_channel: Option,
+ ibc_source_channel: Option,
) -> Result> {
if let Some(channel_id) = ibc_source_channel {
- MsgTransfer::new_with_default_timeout(channel_id, sender, receiver, Coin {
+ MsgTransfer::new_with_default_timeout(channel_id.to_string(), sender, receiver, Coin {
denom: denom.clone(),
amount: amount.into(),
})
@@ -3924,86 +4239,6 @@ pub(crate) async fn create_withdraw_msg_as_any(
.map_to_mm(|e| WithdrawError::InternalError(e.to_string()))
}
-pub async fn get_ibc_transfer_channels(
- source_registry_name: String,
- destination_registry_name: String,
-) -> IBCTransferChannelsResult {
- #[derive(Deserialize)]
- struct ChainRegistry {
- channels: Vec,
- }
-
- #[derive(Deserialize)]
- struct ChannelInfo {
- channel_id: String,
- port_id: String,
- }
-
- #[derive(Deserialize)]
- struct IbcChannel {
- #[allow(dead_code)]
- chain_1: ChannelInfo,
- chain_2: ChannelInfo,
- ordering: String,
- version: String,
- tags: Option,
- }
-
- let source_filename = format!("{}-{}.json", source_registry_name, destination_registry_name);
- let git_controller: GitController = GitController::new(GITHUB_API_URI);
-
- let metadata_list = git_controller
- .client
- .get_file_metadata_list(
- CHAIN_REGISTRY_REPO_OWNER,
- CHAIN_REGISTRY_REPO_NAME,
- CHAIN_REGISTRY_BRANCH,
- CHAIN_REGISTRY_IBC_DIR_NAME,
- )
- .await
- .map_err(|e| IBCTransferChannelsRequestError::Transport(format!("{:?}", e)))?;
-
- let source_channel_file = metadata_list
- .iter()
- .find(|metadata| metadata.name == source_filename)
- .or_mm_err(|| IBCTransferChannelsRequestError::RegistrySourceCouldNotFound(source_filename))?;
-
- let mut registry_object = git_controller
- .client
- .deserialize_json_source::(source_channel_file.to_owned())
- .await
- .map_err(|e| IBCTransferChannelsRequestError::Transport(format!("{:?}", e)))?;
-
- registry_object
- .channels
- .retain(|ch| ch.chain_2.port_id == *IBC_OUT_SOURCE_PORT);
-
- let result: Vec = registry_object
- .channels
- .iter()
- .map(|ch| IBCTransferChannel {
- channel_id: ch.chain_2.channel_id.clone(),
- ordering: ch.ordering.clone(),
- version: ch.version.clone(),
- tags: ch.tags.clone().map(|t| IBCTransferChannelTag {
- status: t.status,
- preferred: t.preferred,
- dex: t.dex,
- }),
- })
- .collect();
-
- if result.is_empty() {
- return MmError::err(IBCTransferChannelsRequestError::CouldNotFindChannel(
- destination_registry_name,
- ));
- }
-
- Ok(IBCTransferChannelsResponse {
- ibc_transfer_channels: result,
- })
-}
-
fn extract_big_decimal_from_dec_coin(dec_coin: &DecCoin, decimals: u32) -> Result {
let raw = BigDecimal::from_str(&dec_coin.amount)?;
// `DecCoin` represents decimal numbers as integer-like strings where the last 18 digits are the decimal part.
@@ -4025,8 +4260,17 @@ fn parse_expected_sequence_number(e: &str) -> MmResult) -> BytesJson {
+ let mut bytes = bytes.to_vec();
+
+ if let Some(token_id) = token_id {
+ bytes.extend_from_slice(&token_id);
+ }
+ sha256(&bytes).to_vec().into()
+}
+
#[cfg(test)]
-pub mod tendermint_coin_tests {
+pub mod tendermint_falsecoin_tests {
use super::*;
use crate::DexFeeBurnDestination;
@@ -4076,33 +4320,39 @@ pub mod tendermint_coin_tests {
fn get_iris_usdc_ibc_protocol() -> TendermintProtocolInfo {
TendermintProtocolInfo {
decimals: 6,
- denom: String::from("ibc/5C465997B4F582F602CD64E12031C6A6E18CAF1E6EDC9B5D808822DC0B5F850C"),
- account_prefix: String::from("iaa"),
- chain_id: String::from("nyancat-9"),
+ denom: Denom::from_str("ibc/5C465997B4F582F602CD64E12031C6A6E18CAF1E6EDC9B5D808822DC0B5F850C").unwrap(),
+ min_balance_for_ibc_routing: None,
+ account_prefix: String::from(IRIS_PREFIX),
+ chain_id: ChainId::from_str("nyancat-9").unwrap(),
gas_price: None,
- chain_registry_name: None,
+ ibc_channels: HashMap::new(),
}
}
fn get_iris_protocol() -> TendermintProtocolInfo {
+ let mut ibc_channels = HashMap::new();
+ ibc_channels.insert("cosmos".into(), ChannelId::new(0));
+
TendermintProtocolInfo {
decimals: 6,
- denom: String::from("unyan"),
- account_prefix: String::from("iaa"),
- chain_id: String::from("nyancat-9"),
+ denom: Denom::from_str("unyan").unwrap(),
+ min_balance_for_ibc_routing: None,
+ account_prefix: String::from(IRIS_PREFIX),
+ chain_id: ChainId::from_str("nyancat-9").unwrap(),
gas_price: None,
- chain_registry_name: None,
+ ibc_channels,
}
}
fn get_iris_ibc_nucleus_protocol() -> TendermintProtocolInfo {
TendermintProtocolInfo {
decimals: 6,
- denom: String::from("ibc/F7F28FF3C09024A0225EDBBDB207E5872D2B4EF2FB874FE47B05EF9C9A7D211C"),
- account_prefix: String::from("nuc"),
- chain_id: String::from("nucleus-testnet"),
+ denom: Denom::from_str("ibc/F7F28FF3C09024A0225EDBBDB207E5872D2B4EF2FB874FE47B05EF9C9A7D211C").unwrap(),
+ min_balance_for_ibc_routing: None,
+ account_prefix: String::from(NUCLEUS_PREFIX),
+ chain_id: ChainId::from_str("nucleus-testnet").unwrap(),
gas_price: None,
- chain_registry_name: None,
+ ibc_channels: HashMap::new(),
}
}
@@ -4151,14 +4401,14 @@ pub mod tendermint_coin_tests {
nodes,
false,
activation_policy,
- false,
+ Default::default(),
))
.unwrap();
// << BEGIN HTLC CREATION
let to: AccountId = IRIS_TESTNET_HTLC_PAIR2_ADDRESS.parse().unwrap();
let amount = 1;
- let amount_dec = big_decimal_from_sat_unsigned(amount, coin.decimals);
+ let amount_dec = big_decimal_from_sat_unsigned(amount, coin.decimals());
let mut sec = [0u8; 32];
common::os_rng(&mut sec).unwrap();
@@ -4168,7 +4418,7 @@ pub mod tendermint_coin_tests {
let create_htlc_tx = coin
.gen_create_htlc_tx(
- coin.denom.clone(),
+ coin.protocol_info.denom.clone(),
&to,
amount.into(),
sha256(&sec).as_slice(),
@@ -4269,7 +4519,7 @@ pub mod tendermint_coin_tests {
nodes,
false,
activation_policy,
- false,
+ Default::default(),
))
.unwrap();
@@ -4323,7 +4573,7 @@ pub mod tendermint_coin_tests {
nodes,
false,
activation_policy,
- false,
+ Default::default(),
))
.unwrap();
@@ -4394,7 +4644,7 @@ pub mod tendermint_coin_tests {
nodes,
false,
activation_policy,
- false,
+ Default::default(),
))
.unwrap();
@@ -4587,7 +4837,7 @@ pub mod tendermint_coin_tests {
nucleus_nodes,
false,
activation_policy,
- false,
+ Default::default(),
))
.unwrap();
@@ -4650,7 +4900,7 @@ pub mod tendermint_coin_tests {
nodes,
false,
activation_policy,
- false,
+ Default::default(),
))
.unwrap();
@@ -4733,7 +4983,7 @@ pub mod tendermint_coin_tests {
nodes,
false,
activation_policy,
- false,
+ Default::default(),
))
.unwrap();
@@ -4809,7 +5059,7 @@ pub mod tendermint_coin_tests {
nodes,
false,
activation_policy,
- false,
+ Default::default(),
))
.unwrap();
@@ -4881,7 +5131,7 @@ pub mod tendermint_coin_tests {
nodes,
false,
activation_policy,
- false,
+ Default::default(),
))
.unwrap();
@@ -4936,7 +5186,7 @@ pub mod tendermint_coin_tests {
nodes,
false,
activation_policy,
- false,
+ Default::default(),
))
.unwrap();
@@ -5055,7 +5305,7 @@ pub mod tendermint_coin_tests {
nodes,
false,
activation_policy,
- false,
+ Default::default(),
))
.unwrap();
@@ -5105,7 +5355,7 @@ pub mod tendermint_coin_tests {
nodes,
false,
activation_policy,
- false,
+ Default::default(),
))
.unwrap();
@@ -5133,4 +5383,41 @@ pub mod tendermint_coin_tests {
assert_eq!(expected_list, actual_list);
}
+
+ #[test]
+ fn test_get_ibc_channel_for_target_address() {
+ let nodes = vec![RpcNode::for_test(IRIS_TESTNET_RPC_URL)];
+ let protocol_conf = get_iris_protocol();
+ let ctx = mm2_core::mm_ctx::MmCtxBuilder::default().into_mm_arc();
+ let conf = TendermintConf {
+ avg_blocktime: AVG_BLOCKTIME,
+ derivation_path: None,
+ };
+
+ let key_pair = key_pair_from_seed(IRIS_TESTNET_HTLC_PAIR1_SEED).unwrap();
+ let tendermint_pair = TendermintKeyPair::new(key_pair.private().secret, *key_pair.public());
+ let activation_policy =
+ TendermintActivationPolicy::with_private_key_policy(TendermintPrivKeyPolicy::Iguana(tendermint_pair));
+
+ let coin = block_on(TendermintCoin::init(
+ &ctx,
+ "IRIS-TEST".to_string(),
+ conf,
+ protocol_conf,
+ nodes,
+ false,
+ activation_policy,
+ Default::default(),
+ ))
+ .unwrap();
+
+ let expected_channel = ChannelId::new(0);
+ let expected_channel_str = "channel-0";
+
+ let actual_channel = block_on(coin.get_healthy_ibc_channel_for_address_prefix("cosmos")).unwrap();
+ let actual_channel_str = actual_channel.to_string();
+
+ assert_eq!(expected_channel, actual_channel);
+ assert_eq!(expected_channel_str, actual_channel_str);
+ }
}
diff --git a/mm2src/coins/tendermint/tendermint_token.rs b/mm2src/coins/tendermint/tendermint_token.rs
index 589220b555..728541e9c3 100644
--- a/mm2src/coins/tendermint/tendermint_token.rs
+++ b/mm2src/coins/tendermint/tendermint_token.rs
@@ -3,7 +3,8 @@
use super::ibc::IBC_GAS_LIMIT_DEFAULT;
use super::{create_withdraw_msg_as_any, TendermintCoin, TendermintFeeDetails, GAS_LIMIT_DEFAULT, MIN_TX_SATOSHIS,
TIMEOUT_HEIGHT_DELTA, TX_DEFAULT_MEMO};
-use crate::coin_errors::ValidatePaymentResult;
+use crate::coin_errors::{AddressFromPubkeyError, ValidatePaymentResult};
+use crate::hd_wallet::HDAddressSelector;
use crate::utxo::utxo_common::big_decimal_from_sat;
use crate::{big_decimal_from_sat_unsigned, utxo::sat_from_big_decimal, BalanceFut, BigDecimal,
CheckIfMyPaymentSentArgs, CoinBalance, ConfirmPaymentInput, DexFee, FeeApproxStage, FoundSwapTxSpend,
@@ -29,7 +30,7 @@ use mm2_core::mm_ctx::MmArc;
use mm2_err_handle::prelude::*;
use mm2_number::MmNumber;
use primitives::hash::H256;
-use rpc::v1::types::Bytes as BytesJson;
+use rpc::v1::types::{Bytes as BytesJson, H264 as H264Json};
use serde_json::Value as Json;
use std::ops::Deref;
use std::str::FromStr;
@@ -58,7 +59,7 @@ impl Deref for TendermintToken {
pub struct TendermintTokenProtocolInfo {
pub platform: String,
pub decimals: u8,
- pub denom: String,
+ pub denom: Denom,
}
#[derive(Clone, Deserialize)]
@@ -66,7 +67,6 @@ pub struct TendermintTokenActivationParams {}
pub enum TendermintTokenInitError {
Internal(String),
- InvalidDenom(String),
MyAddressError(String),
CouldNotFetchBalance(String),
}
@@ -84,9 +84,8 @@ impl TendermintToken {
ticker: String,
platform_coin: TendermintCoin,
decimals: u8,
- denom: String,
+ denom: Denom,
) -> MmResult {
- let denom = Denom::from_str(&denom).map_to_mm(|e| TendermintTokenInitError::InvalidDenom(e.to_string()))?;
let token_impl = TendermintTokenImpl {
abortable_system: platform_coin.abortable_system.create_subsystem()?,
ticker,
@@ -269,13 +268,19 @@ impl MarketCoinOps for TendermintToken {
fn my_address(&self) -> MmResult { self.platform_coin.my_address() }
+ fn address_from_pubkey(&self, pubkey: &H264Json) -> MmResult {
+ self.platform_coin.address_from_pubkey(pubkey)
+ }
+
async fn get_public_key(&self) -> Result> {
self.platform_coin.get_public_key().await
}
fn sign_message_hash(&self, message: &str) -> Option<[u8; 32]> { self.platform_coin.sign_message_hash(message) }
- fn sign_message(&self, message: &str) -> SignatureResult { self.platform_coin.sign_message(message) }
+ fn sign_message(&self, message: &str, address: Option) -> SignatureResult {
+ self.platform_coin.sign_message(message, address)
+ }
fn verify_message(&self, signature: &str, message: &str, address: &str) -> VerificationResult {
self.platform_coin.verify_message(signature, message, address)
@@ -358,16 +363,7 @@ impl MarketCoinOps for TendermintToken {
impl MmCoin for TendermintToken {
fn is_asset_chain(&self) -> bool { false }
- fn wallet_only(&self, ctx: &MmArc) -> bool {
- let coin_conf = crate::coin_conf(ctx, self.ticker());
- // If coin is not in config, it means that it was added manually (a custom token) and should be treated as wallet only
- if coin_conf.is_null() {
- return true;
- }
- let wallet_only_conf = coin_conf["wallet_only"].as_bool().unwrap_or(false);
-
- wallet_only_conf || self.platform_coin.is_keplr_from_ledger
- }
+ fn wallet_only(&self, ctx: &MmArc) -> bool { self.platform_coin.wallet_only(ctx) }
fn spawner(&self) -> WeakSpawner { self.abortable_system.weak_spawner() }
@@ -378,14 +374,15 @@ impl MmCoin for TendermintToken {
let to_address =
AccountId::from_str(&req.to).map_to_mm(|e| WithdrawError::InvalidAddress(e.to_string()))?;
- let is_ibc_transfer = to_address.prefix() != platform.account_prefix || req.ibc_source_channel.is_some();
+ let is_ibc_transfer =
+ to_address.prefix() != platform.protocol_info.account_prefix || req.ibc_source_channel.is_some();
let (account_id, maybe_priv_key) = platform
.extract_account_id_and_private_key(req.from)
.map_err(|e| WithdrawError::InternalError(e.to_string()))?;
let (base_denom_balance, base_denom_balance_dec) = platform
- .get_balance_as_unsigned_and_decimal(&account_id, &platform.denom, token.decimals())
+ .get_balance_as_unsigned_and_decimal(&account_id, &platform.protocol_info.denom, token.decimals())
.await?;
let (balance_denom, balance_dec) = platform
@@ -430,7 +427,11 @@ impl MmCoin for TendermintToken {
let channel_id = if is_ibc_transfer {
match &req.ibc_source_channel {
Some(_) => req.ibc_source_channel,
- None => Some(platform.detect_channel_id_for_ibc_transfer(&to_address).await?),
+ None => Some(
+ platform
+ .get_healthy_ibc_channel_for_address_prefix(to_address.prefix())
+ .await?,
+ ),
}
} else {
None
@@ -441,7 +442,7 @@ impl MmCoin for TendermintToken {
to_address.clone(),
&token.denom,
amount_denom,
- channel_id.clone(),
+ channel_id,
)
.await?;
@@ -482,7 +483,7 @@ impl MmCoin for TendermintToken {
}
let fee_amount = Coin {
- denom: platform.denom.clone(),
+ denom: platform.protocol_info.denom.clone(),
amount: fee_amount_u64.into(),
};
@@ -492,12 +493,11 @@ impl MmCoin for TendermintToken {
let tx = platform
.any_to_transaction_data(maybe_priv_key, msg_payload, &account_info, fee, timeout_height, &memo)
+ .await
.map_to_mm(|e| WithdrawError::InternalError(e.to_string()))?;
- let internal_id = {
- let hex_vec = tx.tx_hex().cloned().unwrap_or_default().to_vec();
- sha256(&hex_vec).to_vec().into()
- };
+ let internal_id =
+ super::tendermint_tx_internal_id(tx.tx_hash().unwrap_or_default().as_bytes(), Some(token.token_id()));
Ok(TransactionDetails {
tx,
diff --git a/mm2src/coins/tendermint/wallet_connect.rs b/mm2src/coins/tendermint/wallet_connect.rs
new file mode 100644
index 0000000000..d3242d4f77
--- /dev/null
+++ b/mm2src/coins/tendermint/wallet_connect.rs
@@ -0,0 +1,306 @@
+/// https://docs.reown.com/advanced/multichain/rpc-reference/cosmos-rpc
+use base64::engine::general_purpose;
+use base64::Engine;
+use cosmrs::proto::cosmos::tx::v1beta1::TxRaw;
+use kdf_walletconnect::chain::WcChainId;
+use kdf_walletconnect::error::WalletConnectError;
+use kdf_walletconnect::WalletConnectOps;
+use kdf_walletconnect::{chain::WcRequestMethods, WalletConnectCtx};
+use mm2_err_handle::prelude::*;
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
+use std::str::FromStr;
+
+use super::{CosmosTransaction, TendermintCoin, TendermintWalletConnectionType};
+use crate::MarketCoinOps;
+
+#[derive(Debug, Serialize, Deserialize, PartialEq)]
+pub(crate) struct CosmosTxSignedData {
+ pub(crate) signature: CosmosTxSignature,
+ pub(crate) signed: CosmosSignData,
+}
+
+#[derive(Debug, Serialize, Deserialize, PartialEq)]
+pub(crate) struct CosmosTxSignature {
+ pub(crate) pub_key: CosmosTxPublicKey,
+ pub(crate) signature: String,
+}
+
+#[derive(Debug, Serialize, Deserialize, PartialEq)]
+pub(crate) struct CosmosTxPublicKey {
+ #[serde(rename = "type")]
+ pub(crate) key_type: String,
+ pub(crate) value: String,
+}
+
+#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct CosmosSignData {
+ pub(crate) chain_id: String,
+ pub(crate) account_number: String,
+ #[serde(deserialize_with = "deserialize_vec_field")]
+ pub(crate) auth_info_bytes: Vec,
+ #[serde(deserialize_with = "deserialize_vec_field")]
+ pub(crate) body_bytes: Vec,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
+pub enum CosmosAccountAlgo {
+ #[serde(rename = "secp256k1")]
+ Secp256k1,
+ #[serde(rename = "tendermint/PubKeySecp256k1")]
+ TendermintSecp256k1,
+}
+
+impl FromStr for CosmosAccountAlgo {
+ type Err = String;
+ fn from_str(s: &str) -> Result {
+ match s {
+ "secp256k1" => Ok(Self::Secp256k1),
+ "tendermint/PubKeySecp256k1" => Ok(Self::TendermintSecp256k1),
+ _ => Err(format!("Unknown pubkey type: {s}")),
+ }
+ }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub struct CosmosAccount {
+ pub address: String,
+ #[serde(deserialize_with = "deserialize_vec_field")]
+ pub pubkey: Vec,
+ pub algo: CosmosAccountAlgo,
+ #[serde(default)]
+ pub is_ledger: Option,
+}
+
+#[async_trait::async_trait]
+impl WalletConnectOps for TendermintCoin {
+ type Error = MmError;
+ type Params<'a> = serde_json::Value;
+ type SignTxData = TxRaw;
+ type SendTxData = CosmosTransaction;
+
+ async fn wc_chain_id(&self, wc: &WalletConnectCtx) -> Result {
+ let chain_id = WcChainId::new_cosmos(self.protocol_info.chain_id.to_string());
+ let session_topic = self.session_topic()?;
+ wc.validate_update_active_chain_id(session_topic, &chain_id).await?;
+ Ok(chain_id)
+ }
+
+ async fn wc_sign_tx<'a>(
+ &self,
+ wc: &WalletConnectCtx,
+ params: Self::Params<'a>,
+ ) -> Result {
+ let chain_id = self.wc_chain_id(wc).await?;
+ let session_topic = self.session_topic()?;
+ let method = if wc.is_ledger_connection(session_topic) {
+ WcRequestMethods::CosmosSignAmino
+ } else {
+ WcRequestMethods::CosmosSignDirect
+ };
+ let data: CosmosTxSignedData = wc
+ .send_session_request_and_wait(session_topic, &chain_id, method, params)
+ .await?;
+ let signature = general_purpose::STANDARD
+ .decode(data.signature.signature)
+ .map_to_mm(|err| WalletConnectError::PayloadError(err.to_string()))?;
+
+ Ok(TxRaw {
+ body_bytes: data.signed.body_bytes,
+ auth_info_bytes: data.signed.auth_info_bytes,
+ signatures: vec![signature],
+ })
+ }
+
+ async fn wc_send_tx<'a>(
+ &self,
+ _ctx: &WalletConnectCtx,
+ _params: Self::Params<'a>,
+ ) -> Result {
+ todo!()
+ }
+
+ fn session_topic(&self) -> Result<&str, Self::Error> {
+ match self.wallet_type {
+ TendermintWalletConnectionType::WcLedger(ref session_topic)
+ | TendermintWalletConnectionType::Wc(ref session_topic) => Ok(session_topic),
+ _ => MmError::err(WalletConnectError::SessionError(format!(
+ "{} is not activated via WalletConnect",
+ self.ticker()
+ ))),
+ }
+ }
+}
+
+pub async fn cosmos_get_accounts_impl(
+ wc: &WalletConnectCtx,
+ session_topic: &str,
+ chain_id: &str,
+) -> MmResult {
+ let chain_id = WcChainId::new_cosmos(chain_id.to_string());
+ wc.validate_update_active_chain_id(session_topic, &chain_id).await?;
+
+ let (account, properties) = wc.get_account_and_properties_for_chain_id(session_topic, &chain_id)?;
+
+ // Check if session has session_properties and return wallet account;
+ if let Some(props) = properties {
+ if let Some(keys) = &props.keys {
+ if let Some(key) = keys.iter().next() {
+ let pubkey = decode_data(&key.pub_key).map_to_mm(|err| {
+ WalletConnectError::PayloadError(format!("error decoding pubkey payload: {err:?}"))
+ })?;
+ let address = decode_data(&key.address).map_to_mm(|err| {
+ WalletConnectError::PayloadError(format!("error decoding address payload: {err:?}"))
+ })?;
+ let address = hex::encode(address);
+ let algo = CosmosAccountAlgo::from_str(&key.algo).map_to_mm(|err| {
+ WalletConnectError::PayloadError(format!("error decoding algo payload: {err:?}"))
+ })?;
+
+ return Ok(CosmosAccount {
+ address,
+ pubkey,
+ algo,
+ is_ledger: Some(key.is_nano_ledger),
+ });
+ }
+ }
+ }
+
+ let params = serde_json::to_value(&account).unwrap();
+ let accounts: Vec = wc
+ .send_session_request_and_wait(session_topic, &chain_id, WcRequestMethods::CosmosGetAccounts, params)
+ .await?;
+
+ accounts.first().cloned().or_mm_err(|| {
+ WalletConnectError::NoAccountFound("Expected atleast an account from connected wallet".to_string())
+ })
+}
+
+fn deserialize_vec_field<'de, D>(deserializer: D) -> Result, D::Error>
+where
+ D: serde::Deserializer<'de>,
+{
+ let value = Value::deserialize(deserializer)?;
+
+ match value {
+ Value::Object(map) => map
+ .iter()
+ .map(|(_, value)| {
+ value
+ .as_u64()
+ .ok_or_else(|| serde::de::Error::custom("Invalid byte value"))
+ .and_then(|n| {
+ if n <= 255 {
+ Ok(n as u8)
+ } else {
+ Err(serde::de::Error::custom("Invalid byte value"))
+ }
+ })
+ })
+ .collect(),
+ Value::Array(arr) => arr
+ .into_iter()
+ .map(|v| {
+ v.as_u64()
+ .ok_or_else(|| serde::de::Error::custom("Invalid byte value"))
+ .map(|n| n as u8)
+ })
+ .collect(),
+ Value::String(data) => {
+ let data = decode_data(&data).map_err(|err| serde::de::Error::custom(err.to_string()))?;
+ Ok(data)
+ },
+ _ => Err(serde::de::Error::custom("Pubkey must be an string, object or array")),
+ }
+}
+
+fn decode_data(encoded: &str) -> Result, &'static str> {
+ if encoded.chars().all(|c| c.is_ascii_hexdigit()) && encoded.len() % 2 == 0 {
+ hex::decode(encoded).map_err(|_| "Invalid hex encoding")
+ } else if encoded.contains('=') || encoded.contains('/') || encoded.contains('+') || encoded.len() % 4 == 0 {
+ general_purpose::STANDARD
+ .decode(encoded)
+ .map_err(|_| "Invalid base64 encoding")
+ } else {
+ Err("Unknown encoding format")
+ }
+}
+
+#[cfg(test)]
+mod test_cosmos_walletconnect {
+ use serde_json::json;
+
+ use super::{decode_data, CosmosSignData, CosmosTxPublicKey, CosmosTxSignature, CosmosTxSignedData};
+
+ #[test]
+ fn test_decode_base64() {
+ // "Hello world" in base64
+ let base64_data = "SGVsbG8gd29ybGQ=";
+ let expected = b"Hello world".to_vec();
+ let result = decode_data(base64_data);
+ assert_eq!(result.unwrap(), expected, "Base64 decoding failed");
+ }
+
+ #[test]
+ fn test_decode_hex() {
+ // "Hello world" in hex
+ let hex_data = "48656c6c6f20776f726c64";
+ let expected = b"Hello world".to_vec();
+ let result = decode_data(hex_data);
+ assert_eq!(result.unwrap(), expected, "Hex decoding failed");
+ }
+
+ #[test]
+ fn test_deserialize_sign_message_response() {
+ let json = json!({
+ "signature": {
+ "signature": "eGrmDGKTmycxJO56yTQORDzTFjBEBgyBmHc8ey6FbHh9WytzgsJilYBywz5uludhyKePZdRwznamg841fXw50Q==",
+ "pub_key": {
+ "type": "tendermint/PubKeySecp256k1",
+ "value": "AjqZ1rq/EsPAb4SA6l0qjpVMHzqXotYXz23D5kOceYYu"
+ }
+ },
+ "signed": {
+ "chainId": "cosmoshub-4",
+ "authInfoBytes": "0a500a460a1f2f636f736d6f732e63727970746f2e736563703235366b312e5075624b657912230a21023a99d6babf12c3c06f8480ea5d2a8e954c1f3a97a2d617cf6dc3e6439c79862e12040a020801180212140a0e0a057561746f6d1205313837353010c8d007",
+ "bodyBytes": "0a8e010a1c2f636f736d6f732e62616e6b2e763162657461312e4d736753656e64126e0a2d636f736d6f7331376c386432737973646e3667683636786d366664666b6575333634703836326a68396c6e6667122d636f736d6f7331376c386432737973646e3667683636786d366664666b6575333634703836326a68396c6e66671a0e0a057561746f6d12053430303030189780e00a",
+ "accountNumber": "2934714"
+ }
+ });
+ let expected_tx = CosmosTxSignedData {
+ signature: CosmosTxSignature {
+ pub_key: CosmosTxPublicKey {
+ key_type: "tendermint/PubKeySecp256k1".to_owned(),
+ value: "AjqZ1rq/EsPAb4SA6l0qjpVMHzqXotYXz23D5kOceYYu".to_owned(),
+ },
+ signature: "eGrmDGKTmycxJO56yTQORDzTFjBEBgyBmHc8ey6FbHh9WytzgsJilYBywz5uludhyKePZdRwznamg841fXw50Q=="
+ .to_owned(),
+ },
+ signed: CosmosSignData {
+ chain_id: "cosmoshub-4".to_owned(),
+ account_number: "2934714".to_owned(),
+ auth_info_bytes: vec![
+ 10, 80, 10, 70, 10, 31, 47, 99, 111, 115, 109, 111, 115, 46, 99, 114, 121, 112, 116, 111, 46, 115,
+ 101, 99, 112, 50, 53, 54, 107, 49, 46, 80, 117, 98, 75, 101, 121, 18, 35, 10, 33, 2, 58, 153, 214,
+ 186, 191, 18, 195, 192, 111, 132, 128, 234, 93, 42, 142, 149, 76, 31, 58, 151, 162, 214, 23, 207,
+ 109, 195, 230, 67, 156, 121, 134, 46, 18, 4, 10, 2, 8, 1, 24, 2, 18, 20, 10, 14, 10, 5, 117, 97,
+ 116, 111, 109, 18, 5, 49, 56, 55, 53, 48, 16, 200, 208, 7,
+ ],
+ body_bytes: vec![
+ 10, 142, 1, 10, 28, 47, 99, 111, 115, 109, 111, 115, 46, 98, 97, 110, 107, 46, 118, 49, 98, 101,
+ 116, 97, 49, 46, 77, 115, 103, 83, 101, 110, 100, 18, 110, 10, 45, 99, 111, 115, 109, 111, 115, 49,
+ 55, 108, 56, 100, 50, 115, 121, 115, 100, 110, 54, 103, 104, 54, 54, 120, 109, 54, 102, 100, 102,
+ 107, 101, 117, 51, 54, 52, 112, 56, 54, 50, 106, 104, 57, 108, 110, 102, 103, 18, 45, 99, 111, 115,
+ 109, 111, 115, 49, 55, 108, 56, 100, 50, 115, 121, 115, 100, 110, 54, 103, 104, 54, 54, 120, 109,
+ 54, 102, 100, 102, 107, 101, 117, 51, 54, 52, 112, 56, 54, 50, 106, 104, 57, 108, 110, 102, 103,
+ 26, 14, 10, 5, 117, 97, 116, 111, 109, 18, 5, 52, 48, 48, 48, 48, 24, 151, 128, 224, 10,
+ ],
+ },
+ };
+
+ let actual_tx = serde_json::from_value::(json).unwrap();
+ assert_eq!(expected_tx, actual_tx);
+ }
+}
diff --git a/mm2src/coins/test_coin.rs b/mm2src/coins/test_coin.rs
index ce2511b5b0..13c8beb7a5 100644
--- a/mm2src/coins/test_coin.rs
+++ b/mm2src/coins/test_coin.rs
@@ -3,8 +3,8 @@
use super::{CoinBalance, CommonSwapOpsV2, FindPaymentSpendError, FundingTxSpend, HistorySyncState, MarketCoinOps,
MmCoin, RawTransactionFut, RawTransactionRequest, RefundTakerPaymentArgs, SearchForFundingSpendErr,
SwapOps, TradeFee, TransactionEnum, TransactionFut};
-use crate::coin_errors::ValidatePaymentResult;
-use crate::hd_wallet::AddrToString;
+use crate::coin_errors::{AddressFromPubkeyError, ValidatePaymentResult};
+use crate::hd_wallet::{AddrToString, HDAddressSelector};
use crate::{coin_errors::MyAddressError, BalanceFut, CanRefundHtlc, CheckIfMyPaymentSentArgs, ConfirmPaymentInput,
FeeApproxStage, FoundSwapTxSpend, GenPreimageResult, GenTakerFundingSpendArgs, GenTakerPaymentSpendArgs,
MmCoinEnum, NegotiateSwapContractAddrErr, ParseCoinAssocTypes, PaymentInstructionArgs,
@@ -28,7 +28,7 @@ use mm2_err_handle::prelude::*;
use mm2_number::{BigDecimal, MmNumber};
#[cfg(any(test, feature = "for-tests"))]
use mocktopus::macros::*;
-use rpc::v1::types::Bytes as BytesJson;
+use rpc::v1::types::{Bytes as BytesJson, H264 as H264Json};
use serde_json::Value as Json;
use std::fmt::{Display, Formatter};
use std::ops::Deref;
@@ -65,11 +65,15 @@ impl MarketCoinOps for TestCoin {
fn my_address(&self) -> MmResult { unimplemented!() }
+ fn address_from_pubkey(&self, _pubkey: &H264Json) -> MmResult { unimplemented!() }
+
async fn get_public_key(&self) -> Result> { unimplemented!() }
fn sign_message_hash(&self, _message: &str) -> Option<[u8; 32]> { unimplemented!() }
- fn sign_message(&self, _message: &str) -> SignatureResult { unimplemented!() }
+ fn sign_message(&self, _message: &str, _address: Option) -> SignatureResult {
+ unimplemented!()
+ }
fn verify_message(&self, _signature: &str, _message: &str, _address: &str) -> VerificationResult {
unimplemented!()
@@ -109,7 +113,7 @@ impl MarketCoinOps for TestCoin {
fn min_trading_vol(&self) -> MmNumber { MmNumber::from("0.00777") }
- fn is_kmd(&self) -> bool { &self.ticker == "KMD" }
+ fn should_burn_directly(&self) -> bool { &self.ticker == "KMD" }
fn should_burn_dex_fee(&self) -> bool { false }
diff --git a/mm2src/coins/utxo.rs b/mm2src/coins/utxo.rs
index 35e7281d4e..53e9bc7cdb 100644
--- a/mm2src/coins/utxo.rs
+++ b/mm2src/coins/utxo.rs
@@ -260,29 +260,61 @@ pub struct AdditionalTxData {
pub received_by_me: u64,
pub spent_by_me: u64,
pub fee_amount: u64,
- pub unused_change: u64,
pub kmd_rewards: Option,
}
/// The fee set from coins config
#[derive(Debug)]
-pub enum TxFee {
+pub enum FeeRate {
/// Tell the coin that it should request the fee from daemon RPC and calculate it relying on tx size
Dynamic(EstimateFeeMethod),
/// Tell the coin that it has fixed tx fee per kb.
FixedPerKb(u64),
}
-/// The actual "runtime" fee that is received from RPC in case of dynamic calculation
+/// The actual "runtime" tx fee rate (per kb) that is received from RPC in case of dynamic calculation
+/// or fixed tx fee rate
#[derive(Copy, Clone, Debug, PartialEq)]
-pub enum ActualTxFee {
+pub enum ActualFeeRate {
/// fee amount per Kbyte received from coin RPC
Dynamic(u64),
- /// Use specified amount per each 1 kb of transaction and also per each output less than amount.
+ /// Use specified fee amount per each 1 kb of transaction and also per each output less than the fee amount.
/// Used by DOGE, but more coins might support it too.
FixedPerKb(u64),
}
+impl ActualFeeRate {
+ fn get_tx_fee(&self, tx_size: u64) -> u64 {
+ match self {
+ ActualFeeRate::Dynamic(fee_rate) => (fee_rate * tx_size) / KILO_BYTE,
+ // return fee_rate here as swap spend transaction size is always less than 1 kb
+ ActualFeeRate::FixedPerKb(fee_rate) => {
+ let tx_size_kb = if tx_size % KILO_BYTE == 0 {
+ tx_size / KILO_BYTE
+ } else {
+ tx_size / KILO_BYTE + 1
+ };
+ fee_rate * tx_size_kb
+ },
+ }
+ }
+
+ /// Return extra tx fee for the change output as p2pkh
+ fn get_tx_fee_for_change(&self, tx_size: u64) -> u64 {
+ match self {
+ ActualFeeRate::Dynamic(fee_rate) => (*fee_rate * P2PKH_OUTPUT_LEN) / KILO_BYTE,
+ ActualFeeRate::FixedPerKb(fee_rate) => {
+ // take into account the change output if tx_size_kb(tx with change) > tx_size_kb(tx without change)
+ if tx_size % KILO_BYTE + P2PKH_OUTPUT_LEN > KILO_BYTE {
+ *fee_rate
+ } else {
+ 0
+ }
+ },
+ }
+ }
+}
+
/// Fee policy applied on transaction creation
pub enum FeePolicy {
/// Send the exact amount specified in output(s), fee is added to spent input amount
@@ -577,7 +609,7 @@ pub struct UtxoCoinFields {
/// Emercoin has 6
/// Bitcoin Diamond has 7
pub decimals: u8,
- pub tx_fee: TxFee,
+ pub tx_fee: FeeRate,
/// Minimum transaction value at which the value is not less than fee
pub dust_amount: u64,
/// RPC client
@@ -592,6 +624,7 @@ pub struct UtxoCoinFields {
/// The cache of recently send transactions used to track the spent UTXOs and replace them with new outputs
/// The daemon needs some time to update the listunspent list for address which makes it return already spent UTXOs
/// This cache helps to prevent UTXO reuse in such cases
+ // TODO: change the type of `recently_spent_outpoints` to `AsyncMutex>` to better support HD wallets.
pub recently_spent_outpoints: AsyncMutex,
pub tx_hash_algo: TxHashAlgo,
/// The flag determines whether to use mature unspent outputs *only* to generate transactions.
@@ -839,18 +872,15 @@ pub trait UtxoTxBroadcastOps {
#[async_trait]
#[cfg_attr(test, mockable)]
pub trait UtxoTxGenerationOps {
- async fn get_tx_fee(&self) -> UtxoRpcResult;
+ async fn get_fee_rate(&self) -> UtxoRpcResult;
/// Calculates interest if the coin is KMD
/// Adds the value to existing output to my_script_pub or creates additional interest output
/// returns transaction and data as is if the coin is not KMD
- async fn calc_interest_if_required(
- &self,
- mut unsigned: TransactionInputSigner,
- mut data: AdditionalTxData,
- my_script_pub: Bytes,
- dust: u64,
- ) -> UtxoRpcResult<(TransactionInputSigner, AdditionalTxData)>;
+ async fn calc_interest_if_required(&self, unsigned: &mut TransactionInputSigner) -> UtxoRpcResult;
+
+ /// Returns `true` if this coin supports Komodo-style interest accrual; otherwise, returns `false`.
+ fn supports_interest(&self) -> bool;
}
/// The UTXO address balance scanner.
@@ -1747,7 +1777,6 @@ where
{
let my_address = try_tx_s!(coin.as_ref().derivation_method.single_addr_or_err().await);
let key_pair = try_tx_s!(coin.as_ref().priv_key_policy.activated_key_or_err());
-
let mut builder = UtxoTxBuilder::new(coin)
.await
.add_available_inputs(unspents)
diff --git a/mm2src/coins/utxo/bch.rs b/mm2src/coins/utxo/bch.rs
index e38a59ce27..062f15fc66 100644
--- a/mm2src/coins/utxo/bch.rs
+++ b/mm2src/coins/utxo/bch.rs
@@ -1,8 +1,9 @@
use super::*;
use crate::coin_balance::{EnableCoinBalanceError, HDAddressBalance, HDWalletBalance, HDWalletBalanceOps};
-use crate::coin_errors::{MyAddressError, ValidatePaymentResult};
-use crate::hd_wallet::{ExtractExtendedPubkey, HDCoinAddress, HDCoinWithdrawOps, HDExtractPubkeyError, HDXPubExtractor,
- TrezorCoinError, WithdrawSenderAddress};
+use crate::coin_errors::{AddressFromPubkeyError, MyAddressError, ValidatePaymentResult};
+use crate::hd_wallet::{ExtractExtendedPubkey, HDAddressSelector, HDCoinAddress, HDCoinWithdrawOps,
+ HDExtractPubkeyError, HDXPubExtractor, SettingEnabledAddressError, TrezorCoinError,
+ WithdrawSenderAddress};
use crate::my_tx_history_v2::{CoinWithTxHistoryV2, MyTxHistoryErrorV2, MyTxHistoryTarget, TxDetailsBuilder,
TxHistoryStorage};
use crate::tx_history_storage::{GetTxHistoryFilters, WalletId};
@@ -34,6 +35,7 @@ use keys::CashAddress;
pub use keys::NetworkPrefix as CashAddrPrefix;
use mm2_metrics::MetricsArc;
use mm2_number::MmNumber;
+use rpc::v1::types::H264 as H264Json;
use serde_json::{self as json, Value as Json};
use serialization::{deserialize, CoinVariant};
use std::sync::MutexGuard;
@@ -700,17 +702,13 @@ impl UtxoTxBroadcastOps for BchCoin {
#[async_trait]
#[cfg_attr(test, mockable)]
impl UtxoTxGenerationOps for BchCoin {
- async fn get_tx_fee(&self) -> UtxoRpcResult { utxo_common::get_tx_fee(&self.utxo_arc).await }
+ async fn get_fee_rate(&self) -> UtxoRpcResult { utxo_common::get_fee_rate(&self.utxo_arc).await }
- async fn calc_interest_if_required(
- &self,
- unsigned: TransactionInputSigner,
- data: AdditionalTxData,
- my_script_pub: Bytes,
- dust: u64,
- ) -> UtxoRpcResult<(TransactionInputSigner, AdditionalTxData)> {
- utxo_common::calc_interest_if_required(self, unsigned, data, my_script_pub, dust).await
+ async fn calc_interest_if_required(&self, unsigned: &mut TransactionInputSigner) -> UtxoRpcResult {
+ utxo_common::calc_interest_if_required(self, unsigned).await
}
+
+ fn supports_interest(&self) -> bool { utxo_common::is_kmd(self) }
}
#[async_trait]
@@ -1138,6 +1136,11 @@ impl MarketCoinOps for BchCoin {
fn my_address(&self) -> MmResult { utxo_common::my_address(self) }
+ fn address_from_pubkey(&self, pubkey: &H264Json) -> MmResult {
+ let pubkey = Public::Compressed((*pubkey).into());
+ Ok(UtxoCommonOps::address_from_pubkey(self, &pubkey).to_string())
+ }
+
async fn get_public_key(&self) -> Result> {
let pubkey = utxo_common::my_public_key(&self.utxo_arc)?;
Ok(pubkey.to_string())
@@ -1147,8 +1150,8 @@ impl MarketCoinOps for BchCoin {
utxo_common::sign_message_hash(self.as_ref(), message)
}
- fn sign_message(&self, message: &str) -> SignatureResult {
- utxo_common::sign_message(self.as_ref(), message)
+ fn sign_message(&self, message: &str, address: Option) -> SignatureResult {
+ utxo_common::sign_message(self.as_ref(), message, address)
}
fn verify_message(&self, signature_base64: &str, message: &str, address: &str) -> VerificationResult