diff --git a/.github/actions/deps-install/action.yml b/.github/actions/deps-install/action.yml
index 25ed15bf50..02b0ffbec4 100644
--- a/.github/actions/deps-install/action.yml
+++ b/.github/actions/deps-install/action.yml
@@ -12,33 +12,54 @@ inputs:
runs:
using: 'composite'
steps:
+ - name: Download protoc (Linux)
+ if: runner.os == 'Linux' && contains(inputs.deps, 'protoc')
+ uses: ./.github/actions/download-and-verify
+ with:
+ url: "https://github.com/protocolbuffers/protobuf/releases/download/v25.3/protoc-25.3-linux-x86_64.zip"
+ output_file: "protoc-25.3-linux-x86_64.zip"
+ checksum: "f853e691868d0557425ea290bf7ba6384eef2fa9b04c323afab49a770ba9da80"
+
- name: Install protoc (Linux)
env:
TMP: ${{ inputs.temp || runner.temp }}
if: runner.os == 'Linux' && contains(inputs.deps, 'protoc')
shell: bash
run: |
- wget https://github.com/protocolbuffers/protobuf/releases/download/v25.3/protoc-25.3-linux-x86_64.zip
- unzip protoc-25.3-linux-x86_64 -d "$TMP/protobuf"
+ unzip protoc-25.3-linux-x86_64.zip -d "$TMP/protobuf"
echo "$TMP/protobuf/bin" >> $GITHUB_PATH
+ - name: Download protoc (MacOS)
+ if: runner.os == 'macOS' && contains(inputs.deps, 'protoc')
+ uses: ./.github/actions/download-and-verify
+ with:
+ url: "https://github.com/protocolbuffers/protobuf/releases/download/v25.3/protoc-25.3-osx-x86_64.zip"
+ output_file: "protoc-25.3-osx-x86_64.zip"
+ checksum: "247e003b8e115405172eacc50bd19825209d85940728e766f0848eee7c80e2a1"
+
- name: Install protoc (MacOS)
env:
TMP: ${{ inputs.temp || runner.temp }}
if: runner.os == 'macOS' && contains(inputs.deps, 'protoc')
shell: bash
run: |
- wget https://github.com/protocolbuffers/protobuf/releases/download/v25.3/protoc-25.3-osx-x86_64.zip
unzip protoc-25.3-osx-x86_64.zip -d "$TMP/protobuf"
echo "$TMP/protobuf/bin" >> $GITHUB_PATH
+
+ - name: Download protoc (Windows)
+ uses: ./.github/actions/download-and-verify
+ with:
+ url: "https://github.com/protocolbuffers/protobuf/releases/download/v25.3/protoc-25.3-win64.zip"
+ output_file: "protoc-25.3-win64.zip"
+ checksum: "d6b336b852726364313330631656b7f395dde5b1141b169f5c4b8d43cdf01482"
+
- name: Install protoc (Windows)
env:
TMP: ${{ inputs.temp || runner.temp }}
if: runner.os == 'Windows' && contains(inputs.deps, 'protoc')
shell: powershell
run: |
- Invoke-WebRequest -Uri https://github.com/protocolbuffers/protobuf/releases/download/v25.3/protoc-25.3-win64.zip -OutFile protoc-25.3-win64.zip
7z x protoc-25.3-win64.zip -o"$TMP\protobuf"
echo "$TMP\protobuf\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
diff --git a/.github/actions/download-and-verify/action.yml b/.github/actions/download-and-verify/action.yml
new file mode 100644
index 0000000000..198601f486
--- /dev/null
+++ b/.github/actions/download-and-verify/action.yml
@@ -0,0 +1,46 @@
+name: "Download and verify remote files"
+
+runs:
+ using: "composite"
+ steps:
+ - name: Download (Unix)
+ if: runner.os != 'Windows'
+ shell: bash
+ run: curl -L -o ${{ inputs.output_file }} ${{ inputs.url }}
+
+ - name: Download (Windows)
+ if: runner.os == 'Windows'
+ shell: powershell
+ run: Invoke-WebRequest -Uri ${{ inputs.url }} -OutFile ${{ inputs.output_file }}
+
+ - name: Verify (Unix)
+ if: runner.os != 'Windows'
+ shell: bash
+ run: |
+ if [[ "$RUNNER_OS" == "macOS" ]]; then
+ echo "${{ inputs.checksum }} *${{ inputs.output_file }}" | shasum -a 256 -c
+ else
+ echo "${{ inputs.checksum }} ${{ inputs.output_file }}" | sha256sum -c
+ fi
+
+ - name: Verify (Windows)
+ if: runner.os == 'Windows'
+ shell: powershell
+ run: |
+ $expectedChecksum = "${{ inputs.checksum }}"
+ $actualChecksum = (Get-FileHash -Path "${{ inputs.output_file }}" -Algorithm SHA256).Hash
+ if ($expectedChecksum -ne $actualChecksum) {
+ Write-Output "Checksum did not match! Expected: $expectedChecksum, Found: $actualChecksum"
+ exit 1
+ }
+
+inputs:
+ url:
+ description: "URL of the remote file."
+ required: true
+ output_file:
+ description: "Output path."
+ required: true
+ checksum:
+ description: "Expected checksum of the downloaded file."
+ required: true
diff --git a/.github/workflows/adex-cli.yml b/.github/workflows/adex-cli.yml
deleted file mode 100644
index 32b62f04ed..0000000000
--- a/.github/workflows/adex-cli.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: Adex CLI
-on: [push]
-
-concurrency:
- group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
- cancel-in-progress: true
-
-env:
- BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
-
-jobs:
- code-check:
- name: Code Checks
- timeout-minutes: 60
- runs-on: ${{ matrix.os }}
- strategy:
- matrix:
- os: [ubuntu-latest, macos-latest, windows-latest]
- steps:
- - uses: actions/checkout@v3
-
- - name: Cargo cache
- uses: ./.github/actions/cargo-cache
-
- - name: Start checking code format and lint
- continue-on-error: true
- run: |
- cargo fmt --manifest-path ./mm2src/adex_cli/Cargo.toml --all -- --check
- cargo clippy --manifest-path ./mm2src/adex_cli/Cargo.toml --all-targets --all-features -- --D warnings
-
- - name: Start building
- run: |
- cargo build --manifest-path ./mm2src/adex_cli/Cargo.toml
-
- - name: Start testing
- run: |
- cargo test --manifest-path ./mm2src/adex_cli/Cargo.toml --no-fail-fast
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a9790f9b13..12a60bbc3c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -122,7 +122,7 @@ jobs:
- name: Test
run: |
- wget -O - https://raw.githubusercontent.com/KomodoPlatform/komodo/master/zcutil/fetch-params-alt.sh | bash
+ wget -O - https://raw.githubusercontent.com/KomodoPlatform/komodo/0adeeabdd484ef40539d1275c6a765f5c530ea79/zcutil/fetch-params-alt.sh | bash
cargo test --test 'mm2_tests_main' --no-fail-fast
mac-x86-64-kdf-integration:
@@ -154,7 +154,7 @@ jobs:
- name: Test
run: |
- wget -O - https://raw.githubusercontent.com/KomodoPlatform/komodo/master/zcutil/fetch-params-alt.sh | bash
+ wget -O - https://raw.githubusercontent.com/KomodoPlatform/komodo/0adeeabdd484ef40539d1275c6a765f5c530ea79/zcutil/fetch-params-alt.sh | bash
cargo test --test 'mm2_tests_main' --no-fail-fast
win-x86-64-kdf-integration:
@@ -181,10 +181,16 @@ jobs:
- name: Cargo cache
uses: ./.github/actions/cargo-cache
+ - name: Download wget64
+ uses: ./.github/actions/download-and-verify
+ with:
+ url: "https://github.com/KomodoPlatform/komodo/raw/d456be35acd1f8584e1e4f971aea27bd0644d5c5/zcutil/wget64.exe"
+ output_file: "/wget64.exe"
+ checksum: "d80719431dc22b0e4a070f61fab982b113a4ed9a6d4cf25e64b5be390dcadb94"
+
- name: Test
run: |
- Invoke-WebRequest -Uri https://github.com/KomodoPlatform/komodo/raw/d456be35acd1f8584e1e4f971aea27bd0644d5c5/zcutil/wget64.exe -OutFile \wget64.exe
- Invoke-WebRequest -Uri https://raw.githubusercontent.com/KomodoPlatform/komodo/master/zcutil/fetch-params-alt.bat -OutFile \cmd.bat && \cmd.bat
+ Invoke-WebRequest -Uri https://raw.githubusercontent.com/KomodoPlatform/komodo/0adeeabdd484ef40539d1275c6a765f5c530ea79/zcutil/fetch-params-alt.bat -OutFile \cmd.bat && \cmd.bat
cargo test --test 'mm2_tests_main' --no-fail-fast
docker-tests:
@@ -213,7 +219,7 @@ jobs:
- name: Test
run: |
- wget -O - https://raw.githubusercontent.com/KomodoPlatform/komodo/v0.8.1/zcutil/fetch-params-alt.sh | bash
+ wget -O - https://raw.githubusercontent.com/KomodoPlatform/komodo/v0.8.1//zcutil/fetch-params-alt.sh | bash
cargo test --test 'docker_tests_main' --features run-docker-tests --no-fail-fast
wasm:
@@ -241,11 +247,17 @@ jobs:
- name: Install wasm-pack
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
+ - name: Download geckodriver
+ uses: ./.github/actions/download-and-verify
+ with:
+ url: "https://github.com/mozilla/geckodriver/releases/download/v0.32.2/geckodriver-v0.32.2-linux64.tar.gz"
+ output_file: "geckodriver-v0.32.2-linux64.tar.gz"
+ checksum: "1eab226bf009599f5aa1d77d9ed4c374e10a03fd848b500be1b32cefd2cbec64"
+
- name: Install firefox and geckodriver
run: |
sudo apt-get update -y
sudo apt-get install -y firefox
- wget https://github.com/mozilla/geckodriver/releases/download/v0.32.2/geckodriver-v0.32.2-linux64.tar.gz
sudo tar -xzvf geckodriver-v0.32.2-linux64.tar.gz -C /bin
sudo chmod +x /bin/geckodriver
diff --git a/Cargo.lock b/Cargo.lock
index 429dc8cf7c..fd6f1b4518 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -119,12 +119,6 @@ dependencies = [
"memchr",
]
-[[package]]
-name = "aliasable"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
-
[[package]]
name = "android_system_properties"
version = "0.1.5"
@@ -134,15 +128,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "ansi_term"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-dependencies = [
- "winapi",
-]
-
[[package]]
name = "anyhow"
version = "1.0.42"
@@ -186,12 +171,6 @@ version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "155a5a185e42c6b77ac7b88a15143d930a9e9727a5b7b77eed417404ab15c247"
-[[package]]
-name = "assert_matches"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
-
[[package]]
name = "async-io"
version = "1.13.0"
@@ -261,7 +240,7 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27"
dependencies = [
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"syn 1.0.95",
]
@@ -278,7 +257,7 @@ version = "0.1.76"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "531b97fb4cd3dfdce92c35dedbfdc1f0b9d8091c8ca943d6dae340ef5012d514"
dependencies = [
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"syn 2.0.38",
]
@@ -391,12 +370,6 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
-[[package]]
-name = "base32"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa"
-
[[package]]
name = "base58"
version = "0.2.0"
@@ -409,12 +382,6 @@ version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
-[[package]]
-name = "base64"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
-
[[package]]
name = "base64"
version = "0.13.0"
@@ -471,15 +438,6 @@ dependencies = [
"serde",
]
-[[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
[[package]]
name = "bip32"
version = "0.2.2"
@@ -610,20 +568,6 @@ dependencies = [
"constant_time_eq",
]
-[[package]]
-name = "blake3"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f"
-dependencies = [
- "arrayref",
- "arrayvec 0.7.1",
- "cc",
- "cfg-if 1.0.0",
- "constant_time_eq",
- "digest 0.10.7",
-]
-
[[package]]
name = "block-buffer"
version = "0.9.0"
@@ -695,51 +639,6 @@ dependencies = [
"serde_with",
]
-[[package]]
-name = "borsh"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15bf3650200d8bffa99015595e10f1fbd17de07abbc25bb067da79e769939bfa"
-dependencies = [
- "borsh-derive",
- "hashbrown 0.11.2",
-]
-
-[[package]]
-name = "borsh-derive"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6441c552f230375d18e3cc377677914d2ca2b0d36e52129fe15450a2dce46775"
-dependencies = [
- "borsh-derive-internal",
- "borsh-schema-derive-internal",
- "proc-macro-crate 0.1.5",
- "proc-macro2 1.0.69",
- "syn 1.0.95",
-]
-
-[[package]]
-name = "borsh-derive-internal"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065"
-dependencies = [
- "proc-macro2 1.0.69",
- "quote 1.0.33",
- "syn 1.0.95",
-]
-
-[[package]]
-name = "borsh-schema-derive-internal"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0"
-dependencies = [
- "proc-macro2 1.0.69",
- "quote 1.0.33",
- "syn 1.0.95",
-]
-
[[package]]
name = "bs58"
version = "0.4.0"
@@ -764,42 +663,12 @@ version = "3.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
-[[package]]
-name = "bv"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8834bb1d8ee5dc048ee3124f2c7c1afcc6bc9aed03f11e9dfd8c69470a5db340"
-dependencies = [
- "feature-probe",
- "serde",
-]
-
[[package]]
name = "byte-slice-cast"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "65c1bf4a04a88c54f589125563643d773f3254b5c38571395e2b591c693bbc81"
-[[package]]
-name = "bytemuck"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e851ca7c24871e7336801608a4797d7376545b6928a10d32d75685687141ead"
-dependencies = [
- "bytemuck_derive",
-]
-
-[[package]]
-name = "bytemuck_derive"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e215f8c2f9f79cb53c8335e687ffd07d5bfcb6fe5fc80723762d0be46e7cc54"
-dependencies = [
- "proc-macro2 1.0.69",
- "quote 1.0.33",
- "syn 1.0.95",
-]
-
[[package]]
name = "byteorder"
version = "1.4.3"
@@ -825,44 +694,12 @@ dependencies = [
"serde",
]
-[[package]]
-name = "bzip2"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8"
-dependencies = [
- "bzip2-sys",
- "libc",
-]
-
-[[package]]
-name = "bzip2-sys"
-version = "0.1.11+1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
-
[[package]]
name = "cache-padded"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24508e28c677875c380c20f4d28124fab6f8ed4ef929a1397d7b1a31e92f1005"
-[[package]]
-name = "caps"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61bf7211aad104ce2769ec05efcdfabf85ee84ac92461d142f22cf8badd0e54c"
-dependencies = [
- "errno 0.2.8",
- "libc",
- "thiserror",
-]
-
[[package]]
name = "cbc"
version = "0.1.2"
@@ -877,9 +714,6 @@ name = "cc"
version = "1.0.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "581f5dba903aac52ea3feb5ec4810848460ee833876f1f9b0fdeab1f19091574"
-dependencies = [
- "jobserver",
-]
[[package]]
name = "cfg-if"
@@ -965,21 +799,6 @@ dependencies = [
"inout",
]
-[[package]]
-name = "clap"
-version = "2.33.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
-dependencies = [
- "ansi_term",
- "atty",
- "bitflags",
- "strsim 0.8.0",
- "textwrap",
- "unicode-width",
- "vec_map",
-]
-
[[package]]
name = "cloudabi"
version = "0.0.3"
@@ -989,15 +808,6 @@ dependencies = [
"bitflags",
]
-[[package]]
-name = "cloudabi"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467"
-dependencies = [
- "bitflags",
-]
-
[[package]]
name = "codespan-reporting"
version = "0.11.1"
@@ -1016,7 +826,6 @@ dependencies = [
"async-trait",
"base58",
"base64 0.21.7",
- "bincode",
"bip32",
"bitcoin",
"bitcoin_hashes",
@@ -1035,7 +844,6 @@ dependencies = [
"derive_more",
"dirs",
"ed25519-dalek",
- "ed25519-dalek-bip32 0.2.0",
"enum_derives",
"ethabi",
"ethcore-transaction",
@@ -1080,7 +888,7 @@ dependencies = [
"mocktopus",
"nom",
"num-traits",
- "parking_lot 0.12.0",
+ "parking_lot",
"primitives",
"prost",
"prost-build",
@@ -1095,7 +903,6 @@ dependencies = [
"rpc_task",
"rust-ini",
"rustls 0.21.10",
- "satomic-swap",
"script",
"secp256k1 0.20.3",
"secp256k1 0.24.3",
@@ -1110,11 +917,6 @@ dependencies = [
"sha2 0.10.7",
"sha3 0.9.1",
"sia-rust",
- "solana-client",
- "solana-sdk",
- "solana-transaction-status",
- "spl-associated-token-account",
- "spl-token",
"spv_validation",
"tendermint-rpc",
"time 0.3.20",
@@ -1126,7 +928,7 @@ dependencies = [
"tower-service",
"url",
"utxo_signer",
- "uuid 1.2.2",
+ "uuid",
"wagyu-zcash-parameters",
"wasm-bindgen",
"wasm-bindgen-futures",
@@ -1164,7 +966,7 @@ dependencies = [
"mm2_metamask",
"mm2_metrics",
"mm2_number",
- "parking_lot 0.12.0",
+ "parking_lot",
"rpc",
"rpc_task",
"ser_error",
@@ -1208,7 +1010,7 @@ dependencies = [
"libc",
"lightning",
"log",
- "parking_lot 0.12.0",
+ "parking_lot",
"parking_lot_core 0.6.2",
"paste",
"primitive-types",
@@ -1225,7 +1027,7 @@ dependencies = [
"sha2 0.10.7",
"shared_ref_counter",
"tokio",
- "uuid 1.2.2",
+ "uuid",
"wasm-bindgen",
"wasm-bindgen-futures",
"wasm-bindgen-test",
@@ -1251,21 +1053,6 @@ dependencies = [
"crossbeam-utils 0.8.16",
]
-[[package]]
-name = "console"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31"
-dependencies = [
- "encode_unicode",
- "libc",
- "once_cell",
- "regex",
- "terminal_size",
- "unicode-width",
- "winapi",
-]
-
[[package]]
name = "console_error_panic_hook"
version = "0.1.7"
@@ -1276,16 +1063,6 @@ dependencies = [
"wasm-bindgen",
]
-[[package]]
-name = "console_log"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501a375961cef1a0d44767200e66e4a559283097e91d0730b1d75dfb2f8a1494"
-dependencies = [
- "log",
- "web-sys",
-]
-
[[package]]
name = "const-oid"
version = "0.9.6"
@@ -1325,9 +1102,9 @@ dependencies = [
[[package]]
name = "cosmos-sdk-proto"
-version = "0.19.0"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73c9d2043a9e617b0d602fbc0a0ecd621568edbf3a9774890a6d562389bd8e1c"
+checksum = "32560304ab4c365791fd307282f76637213d8083c1a98490c35159cd67852237"
dependencies = [
"prost",
"prost-types",
@@ -1336,18 +1113,18 @@ dependencies = [
[[package]]
name = "cosmrs"
-version = "0.14.0"
+version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af13955d6f356272e6def9ff5e2450a7650df536d8934f47052a20c76513d2f6"
+checksum = "47126f5364df9387b9d8559dcef62e99010e1d4098f39eb3f7ee4b5c254e40ea"
dependencies = [
"cosmos-sdk-proto",
"ecdsa",
"eyre",
- "getrandom 0.2.9",
"k256",
"rand_core 0.6.4",
"serde",
"serde_json",
+ "signature 2.2.0",
"subtle-encoding",
"tendermint",
"thiserror",
@@ -1557,7 +1334,7 @@ dependencies = [
"mm2_eth",
"mm2_metamask",
"num-traits",
- "parking_lot 0.12.0",
+ "parking_lot",
"primitives",
"rpc",
"rpc_task",
@@ -1608,16 +1385,6 @@ dependencies = [
"subtle",
]
-[[package]]
-name = "crypto-mac"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58bcd97a54c7ca5ce2f6eb16f6bede5b0ab5f0055fedc17d2f0b4466e21671ca"
-dependencies = [
- "generic-array",
- "subtle",
-]
-
[[package]]
name = "crypto-mac"
version = "0.11.1"
@@ -1724,7 +1491,7 @@ dependencies = [
"cc",
"codespan-reporting",
"lazy_static",
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"scratch",
"syn 1.0.95",
@@ -1742,7 +1509,7 @@ version = "1.0.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b846f081361125bfc8dc9d3940c84e1fd83ba54bbca7b17cd29483c828be0704"
dependencies = [
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"syn 1.0.95",
]
@@ -1765,9 +1532,9 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
dependencies = [
"fnv",
"ident_case",
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
- "strsim 0.10.0",
+ "strsim",
"syn 1.0.95",
]
@@ -1782,17 +1549,6 @@ dependencies = [
"syn 1.0.95",
]
-[[package]]
-name = "dashmap"
-version = "4.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c"
-dependencies = [
- "cfg-if 1.0.0",
- "num_cpus",
- "rayon",
-]
-
[[package]]
name = "data-encoding"
version = "2.4.0"
@@ -1831,7 +1587,7 @@ dependencies = [
"rusqlite",
"sql-builder",
"tokio",
- "uuid 1.2.2",
+ "uuid",
]
[[package]]
@@ -1844,55 +1600,17 @@ dependencies = [
"zeroize",
]
-[[package]]
-name = "derivation-path"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "193388a8c8c75a490b604ff61775e236541b8975e98e5ca1f6ea97d122b7e2db"
-dependencies = [
- "failure",
-]
-
-[[package]]
-name = "derivation-path"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e5c37193a1db1d8ed868c03ec7b152175f26160a5b740e5e484143877e0adf0"
-
-[[package]]
-name = "derivative"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
-dependencies = [
- "proc-macro2 1.0.69",
- "quote 1.0.33",
- "syn 1.0.95",
-]
-
[[package]]
name = "derive_more"
version = "0.99.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41cb0e6161ad61ed084a36ba71fbba9e3ac5aee3606fb607fe08da6acbcf3d8c"
dependencies = [
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"syn 1.0.95",
]
-[[package]]
-name = "dialoguer"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61579ada4ec0c6031cfac3f86fdba0d195a7ebeb5e36693bd53cb5999a25beeb"
-dependencies = [
- "console",
- "lazy_static",
- "tempfile",
- "zeroize",
-]
-
[[package]]
name = "digest"
version = "0.9.0"
@@ -1914,15 +1632,6 @@ dependencies = [
"subtle",
]
-[[package]]
-name = "dir-diff"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2860407d7d7e2e004bb2128510ad9e8d669e76fa005ccf567977b5d71b8b4a0b"
-dependencies = [
- "walkdir",
-]
-
[[package]]
name = "directories"
version = "3.0.2"
@@ -1943,16 +1652,6 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "dirs-next"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
-dependencies = [
- "cfg-if 1.0.0",
- "dirs-sys-next",
-]
-
[[package]]
name = "dirs-sys"
version = "0.3.6"
@@ -1964,40 +1663,6 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
-dependencies = [
- "libc",
- "redox_users 0.4.0",
- "winapi",
-]
-
-[[package]]
-name = "dlopen"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71e80ad39f814a9abe68583cd50a2d45c8a67561c3361ab8da240587dda80937"
-dependencies = [
- "dlopen_derive",
- "lazy_static",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "dlopen_derive"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f236d9e1b1fbd81cea0f9cbdc8dcc7e8ebcd80e6659cd7cb2ad5f6c05946c581"
-dependencies = [
- "libc",
- "quote 0.6.13",
- "syn 0.15.44",
-]
-
[[package]]
name = "dtoa"
version = "1.0.2"
@@ -2066,31 +1731,6 @@ dependencies = [
"zeroize",
]
-[[package]]
-name = "ed25519-dalek-bip32"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057f328f31294b5ab432e6c39642f54afd1531677d6d4ba2905932844cc242f3"
-dependencies = [
- "derivation-path 0.1.3",
- "ed25519-dalek",
- "failure",
- "hmac 0.9.0",
- "sha2 0.9.9",
-]
-
-[[package]]
-name = "ed25519-dalek-bip32"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d2be62a4061b872c8c0873ee4fc6f101ce7b889d039f019c5fa2af471a59908"
-dependencies = [
- "derivation-path 0.2.0",
- "ed25519-dalek",
- "hmac 0.12.1",
- "sha2 0.10.7",
-]
-
[[package]]
name = "edit-distance"
version = "2.1.0"
@@ -2122,12 +1762,6 @@ dependencies = [
"zeroize",
]
-[[package]]
-name = "encode_unicode"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
-
[[package]]
name = "encoding_rs"
version = "0.8.28"
@@ -2150,7 +1784,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116"
dependencies = [
"heck",
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"syn 1.0.95",
]
@@ -2171,7 +1805,7 @@ name = "enum_derives"
version = "0.1.0"
dependencies = [
"itertools",
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"syn 1.0.95",
]
@@ -2327,28 +1961,6 @@ dependencies = [
"once_cell",
]
-[[package]]
-name = "failure"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86"
-dependencies = [
- "backtrace",
- "failure_derive",
-]
-
-[[package]]
-name = "failure_derive"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
-dependencies = [
- "proc-macro2 1.0.69",
- "quote 1.0.33",
- "syn 1.0.95",
- "synstructure",
-]
-
[[package]]
name = "fallible-iterator"
version = "0.2.0"
@@ -2370,12 +1982,6 @@ dependencies = [
"instant",
]
-[[package]]
-name = "feature-probe"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da"
-
[[package]]
name = "ff"
version = "0.8.0"
@@ -2403,18 +2009,6 @@ version = "0.1.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77"
-[[package]]
-name = "filetime"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "redox_syscall 0.2.10",
- "winapi",
-]
-
[[package]]
name = "findshlibs"
version = "0.5.0"
@@ -2473,11 +2067,10 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "form_urlencoded"
-version = "1.0.1"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
dependencies = [
- "matches",
"percent-encoding",
]
@@ -2605,7 +2198,7 @@ version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"syn 2.0.38",
]
@@ -2689,22 +2282,11 @@ version = "0.14.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
dependencies = [
- "serde",
"typenum",
"version_check",
"zeroize",
]
-[[package]]
-name = "gethostname"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e692e296bfac1d2533ef168d0b60ff5897b8b70a4009276834014dd8924cc028"
-dependencies = [
- "libc",
- "winapi",
-]
-
[[package]]
name = "getrandom"
version = "0.1.14"
@@ -2930,17 +2512,6 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b07f60793ff0a4d9cef0f18e63b5357e06209987153a64648c972c1e5aff336f"
-[[package]]
-name = "hidapi"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b1717343691998deb81766bfcd1dce6df0d5d6c37070b5a3de2bb6d39f7822"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
-
[[package]]
name = "hkd32"
version = "0.6.0"
@@ -2963,16 +2534,6 @@ dependencies = [
"digest 0.9.0",
]
-[[package]]
-name = "hmac"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deae6d9dbb35ec2c502d62b8f7b1c000a0822c3b0794ba36b3149c0a1c840dff"
-dependencies = [
- "crypto-mac 0.9.1",
- "digest 0.9.0",
-]
-
[[package]]
name = "hmac"
version = "0.11.0"
@@ -3203,6 +2764,16 @@ dependencies = [
"unicode-normalization",
]
+[[package]]
+name = "idna"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
[[package]]
name = "if-addrs"
version = "0.7.0"
@@ -3265,7 +2836,7 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5dacb10c5b3bb92d46ba347505a9041e676bb20ad220101326bffb0c93031ee"
dependencies = [
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"syn 1.0.95",
]
@@ -3276,12 +2847,6 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
-[[package]]
-name = "index_list"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9d968042a4902e08810946fc7cd5851eb75e80301342305af755ca06cb82ce"
-
[[package]]
name = "indexmap"
version = "1.9.3"
@@ -3302,18 +2867,6 @@ dependencies = [
"hashbrown 0.14.3",
]
-[[package]]
-name = "indicatif"
-version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b"
-dependencies = [
- "console",
- "lazy_static",
- "number_prefix",
- "regex",
-]
-
[[package]]
name = "inout"
version = "0.1.3"
@@ -3415,15 +2968,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "jobserver"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
-dependencies = [
- "libc",
-]
-
[[package]]
name = "js-sys"
version = "0.3.64"
@@ -3471,9 +3015,7 @@ dependencies = [
"cfg-if 1.0.0",
"ecdsa",
"elliptic-curve",
- "once_cell",
"sha2 0.10.7",
- "signature 2.2.0",
]
[[package]]
@@ -3543,16 +3085,6 @@ version = "0.2.150"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
-[[package]]
-name = "libloading"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd"
-dependencies = [
- "cfg-if 1.0.0",
- "winapi",
-]
-
[[package]]
name = "libm"
version = "0.1.4"
@@ -3635,7 +3167,7 @@ dependencies = [
"multihash",
"multistream-select",
"once_cell",
- "parking_lot 0.12.0",
+ "parking_lot",
"pin-project",
"quick-protobuf",
"rand 0.8.4",
@@ -3655,7 +3187,7 @@ dependencies = [
"libp2p-core",
"libp2p-identity",
"log",
- "parking_lot 0.12.0",
+ "parking_lot",
"smallvec 1.6.1",
"trust-dns-resolver",
]
@@ -3741,7 +3273,7 @@ dependencies = [
"asn1_der",
"bs58 0.5.0",
"ed25519-dalek",
- "libsecp256k1 0.7.0",
+ "libsecp256k1",
"log",
"multihash",
"quick-protobuf",
@@ -3874,7 +3406,7 @@ source = "git+https://github.com/KomodoPlatform/rust-libp2p.git?tag=k-0.52.4#6fc
dependencies = [
"heck",
"proc-macro-warning",
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"syn 2.0.38",
]
@@ -3919,7 +3451,7 @@ dependencies = [
"libp2p-core",
"libp2p-identity",
"log",
- "parking_lot 0.12.0",
+ "parking_lot",
"quicksink",
"rw-stream-sink",
"soketto",
@@ -3941,25 +3473,6 @@ dependencies = [
"yamux 0.13.1",
]
-[[package]]
-name = "libsecp256k1"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9d220bc1feda2ac231cb78c3d26f27676b8cf82c96971f7aeef3d0cf2797c73"
-dependencies = [
- "arrayref",
- "base64 0.12.3",
- "digest 0.9.0",
- "hmac-drbg",
- "libsecp256k1-core 0.2.2",
- "libsecp256k1-gen-ecmult 0.2.1",
- "libsecp256k1-gen-genmult 0.2.1",
- "rand 0.7.3",
- "serde",
- "sha2 0.9.9",
- "typenum",
-]
-
[[package]]
name = "libsecp256k1"
version = "0.7.0"
@@ -3970,26 +3483,15 @@ dependencies = [
"base64 0.13.0",
"digest 0.9.0",
"hmac-drbg",
- "libsecp256k1-core 0.3.0",
- "libsecp256k1-gen-ecmult 0.3.0",
- "libsecp256k1-gen-genmult 0.3.0",
+ "libsecp256k1-core",
+ "libsecp256k1-gen-ecmult",
+ "libsecp256k1-gen-genmult",
"rand 0.8.4",
"serde",
"sha2 0.9.9",
"typenum",
]
-[[package]]
-name = "libsecp256k1-core"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0f6ab710cec28cef759c5f18671a27dae2a5f952cdaaee1d8e2908cb2478a80"
-dependencies = [
- "crunchy",
- "digest 0.9.0",
- "subtle",
-]
-
[[package]]
name = "libsecp256k1-core"
version = "0.3.0"
@@ -4001,31 +3503,13 @@ dependencies = [
"subtle",
]
-[[package]]
-name = "libsecp256k1-gen-ecmult"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccab96b584d38fac86a83f07e659f0deafd0253dc096dab5a36d53efe653c5c3"
-dependencies = [
- "libsecp256k1-core 0.2.2",
-]
-
[[package]]
name = "libsecp256k1-gen-ecmult"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3038c808c55c87e8a172643a7d87187fc6c4174468159cb3090659d55bcb4809"
dependencies = [
- "libsecp256k1-core 0.3.0",
-]
-
-[[package]]
-name = "libsecp256k1-gen-genmult"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67abfe149395e3aa1c48a2beb32b068e2334402df8181f818d3aee2b304c4f5d"
-dependencies = [
- "libsecp256k1-core 0.2.2",
+ "libsecp256k1-core",
]
[[package]]
@@ -4034,7 +3518,7 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3db8d6ba2cec9eacc40e6e8ccc98931840301f1006e95647ceb2dd5c3aa06f7c"
dependencies = [
- "libsecp256k1-core 0.3.0",
+ "libsecp256k1-core",
]
[[package]]
@@ -4231,15 +3715,6 @@ version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-[[package]]
-name = "memmap2"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057a3db23999c867821a7a59feb06a578fcb03685e983dff90daf9e7d24ac08f"
-dependencies = [
- "libc",
-]
-
[[package]]
name = "memoffset"
version = "0.5.6"
@@ -4304,7 +3779,7 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df"
dependencies = [
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"syn 2.0.38",
]
@@ -4405,6 +3880,7 @@ dependencies = [
"mm2_err_handle",
"mm2_event_stream",
"mm2_metrics",
+ "mm2_p2p",
"mm2_rpc",
"primitives",
"rand 0.7.3",
@@ -4415,7 +3891,7 @@ dependencies = [
"serde_json",
"shared_ref_counter",
"tokio",
- "uuid 1.2.2",
+ "uuid",
"wasm-bindgen-test",
]
@@ -4485,7 +3961,7 @@ dependencies = [
"cfg-if 1.0.0",
"common",
"futures 0.3.28",
- "parking_lot 0.12.0",
+ "parking_lot",
"serde",
"tokio",
"wasm-bindgen-test",
@@ -4600,7 +4076,7 @@ dependencies = [
"mocktopus",
"num-traits",
"parity-util-mem",
- "parking_lot 0.12.0",
+ "parking_lot",
"primitive-types",
"primitives",
"prost",
@@ -4635,7 +4111,7 @@ dependencies = [
"trie-db",
"trie-root 0.16.0",
"url",
- "uuid 1.2.2",
+ "uuid",
"wasm-bindgen",
"wasm-bindgen-futures",
"wasm-bindgen-test",
@@ -4658,7 +4134,7 @@ dependencies = [
"lazy_static",
"mm2_err_handle",
"mm2_eth",
- "parking_lot 0.12.0",
+ "parking_lot",
"serde",
"serde_derive",
"serde_json",
@@ -4713,7 +4189,7 @@ dependencies = [
"mm2_event_stream",
"mm2_p2p",
"mm2_state_machine",
- "parking_lot 0.12.0",
+ "parking_lot",
"pin-project",
"prost",
"rand 0.7.3",
@@ -4791,7 +4267,7 @@ dependencies = [
"ser_error_derive",
"serde",
"serde_json",
- "uuid 1.2.2",
+ "uuid",
]
[[package]]
@@ -4829,7 +4305,7 @@ dependencies = [
"serde",
"serde_derive",
"serde_json",
- "uuid 1.2.2",
+ "uuid",
]
[[package]]
@@ -4847,7 +4323,7 @@ version = "0.7.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3048ef3680533a27f9f8e7d6a0bce44dc61e4895ea0f42709337fa1c8616fefe"
dependencies = [
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"syn 1.0.95",
]
@@ -4986,19 +4462,6 @@ dependencies = [
"smallvec 1.6.1",
]
-[[package]]
-name = "nix"
-version = "0.23.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
-dependencies = [
- "bitflags",
- "cc",
- "cfg-if 1.0.0",
- "libc",
- "memoffset 0.6.4",
-]
-
[[package]]
name = "nix"
version = "0.24.3"
@@ -5047,7 +4510,7 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
dependencies = [
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"syn 1.0.95",
]
@@ -5094,34 +4557,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "num_enum"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9bd055fb730c4f8f4f57d45d35cd6b3f0980535b056dc7ff119cee6a66ed6f"
-dependencies = [
- "derivative",
- "num_enum_derive",
-]
-
-[[package]]
-name = "num_enum_derive"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "486ea01961c4a818096de679a8b740b26d9033146ac5291b1c98557658f8cdd9"
-dependencies = [
- "proc-macro-crate 1.1.3",
- "proc-macro2 1.0.69",
- "quote 1.0.33",
- "syn 1.0.95",
-]
-
-[[package]]
-name = "number_prefix"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
-
[[package]]
name = "object"
version = "0.29.0"
@@ -5158,30 +4593,6 @@ dependencies = [
"num-traits",
]
-[[package]]
-name = "ouroboros"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f357ef82d1b4db66fbed0b8d542cbd3c22d0bf5b393b3c257b9ba4568e70c9c3"
-dependencies = [
- "aliasable",
- "ouroboros_macro",
- "stable_deref_trait",
-]
-
-[[package]]
-name = "ouroboros_macro"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44a0b52c2cbaef7dffa5fec1a43274afe8bd2a644fa9fc50a9ef4ff0269b1257"
-dependencies = [
- "Inflector",
- "proc-macro-error",
- "proc-macro2 1.0.69",
- "quote 1.0.33",
- "syn 1.0.95",
-]
-
[[package]]
name = "packed_simd_2"
version = "0.3.8"
@@ -5222,8 +4633,8 @@ version = "3.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c45ed1f39709f5a89338fab50e59816b2e8815f5bb58276e7ddf9afd495f73f8"
dependencies = [
- "proc-macro-crate 1.1.3",
- "proc-macro2 1.0.69",
+ "proc-macro-crate",
+ "proc-macro2",
"quote 1.0.33",
"syn 1.0.95",
]
@@ -5240,7 +4651,7 @@ dependencies = [
"impl-trait-for-tuples",
"lru 0.7.5",
"parity-util-mem-derive",
- "parking_lot 0.12.0",
+ "parking_lot",
"primitive-types",
"smallvec 1.6.1",
"winapi",
@@ -5252,7 +4663,7 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2"
dependencies = [
- "proc-macro2 1.0.69",
+ "proc-macro2",
"syn 1.0.95",
"synstructure",
]
@@ -5269,17 +4680,6 @@ version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"
-[[package]]
-name = "parking_lot"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core 0.8.0",
-]
-
[[package]]
name = "parking_lot"
version = "0.12.0"
@@ -5297,7 +4697,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
dependencies = [
"cfg-if 0.1.10",
- "cloudabi 0.0.3",
+ "cloudabi",
"libc",
"redox_syscall 0.1.56",
"rustc_version 0.2.3",
@@ -5305,21 +4705,6 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "parking_lot_core"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b"
-dependencies = [
- "cfg-if 0.1.10",
- "cloudabi 0.1.0",
- "instant",
- "libc",
- "redox_syscall 0.1.56",
- "smallvec 1.6.1",
- "winapi",
-]
-
[[package]]
name = "parking_lot_core"
version = "0.9.1"
@@ -5350,29 +4735,11 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc"
-[[package]]
-name = "pbkdf2"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd"
-dependencies = [
- "crypto-mac 0.8.0",
-]
-
-[[package]]
-name = "pbkdf2"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f05894bce6a1ba4be299d0c5f29563e08af2bc18bb7d48313113bed71e904739"
-dependencies = [
- "crypto-mac 0.11.1",
-]
-
[[package]]
name = "peg"
-version = "0.7.0"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07c0b841ea54f523f7aa556956fbd293bcbe06f2e67d2eb732b7278aaf1d166a"
+checksum = "295283b02df346d1ef66052a757869b2876ac29a6bb0ac3f5f7cd44aebe40e8f"
dependencies = [
"peg-macros",
"peg-runtime",
@@ -5380,20 +4747,20 @@ dependencies = [
[[package]]
name = "peg-macros"
-version = "0.7.0"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aa52829b8decbef693af90202711348ab001456803ba2a98eb4ec8fb70844c"
+checksum = "bdad6a1d9cf116a059582ce415d5f5566aabcd4008646779dab7fdc2a9a9d426"
dependencies = [
"peg-runtime",
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
]
[[package]]
name = "peg-runtime"
-version = "0.7.0"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c719dcf55f09a3a7e764c6649ab594c18a177e3599c467983cdf644bfc0a4088"
+checksum = "e3aeb8f54c078314c2065ee649a7241f46b9d8e418e1a9581ba0546657d7aa3a"
[[package]]
name = "pem"
@@ -5406,9 +4773,9 @@ dependencies = [
[[package]]
name = "percent-encoding"
-version = "2.1.0"
+version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
[[package]]
name = "petgraph"
@@ -5435,7 +4802,7 @@ version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c"
dependencies = [
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"syn 2.0.38",
]
@@ -5533,12 +4900,12 @@ checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"
[[package]]
name = "prettyplease"
-version = "0.1.11"
+version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f28f53e8b192565862cf99343194579a022eb9c7dd3a8d03134734803c7b3125"
+checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
dependencies = [
- "proc-macro2 1.0.69",
- "syn 1.0.95",
+ "proc-macro2",
+ "syn 2.0.38",
]
[[package]]
@@ -5565,15 +4932,6 @@ dependencies = [
"uint",
]
-[[package]]
-name = "proc-macro-crate"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
-dependencies = [
- "toml",
-]
-
[[package]]
name = "proc-macro-crate"
version = "1.1.3"
@@ -5585,56 +4943,23 @@ dependencies = [
]
[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
+name = "proc-macro-warning"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+checksum = "70550716265d1ec349c41f70dd4f964b4fd88394efe4405f0c1da679c4799a07"
dependencies = [
- "proc-macro-error-attr",
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
- "syn 1.0.95",
- "version_check",
+ "syn 2.0.38",
]
[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
+name = "proc-macro2"
+version = "1.0.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
dependencies = [
- "proc-macro2 1.0.69",
- "quote 1.0.33",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-warning"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70550716265d1ec349c41f70dd4f964b4fd88394efe4405f0c1da679c4799a07"
-dependencies = [
- "proc-macro2 1.0.69",
- "quote 1.0.33",
- "syn 2.0.38",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-dependencies = [
- "unicode-xid 0.1.0",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
-dependencies = [
- "unicode-ident",
+ "unicode-ident",
]
[[package]]
@@ -5645,7 +4970,7 @@ checksum = "78c2f43e8969d51935d2a7284878ae053ba30034cd563f673cde37ba5205685e"
dependencies = [
"dtoa",
"itoa 1.0.10",
- "parking_lot 0.12.0",
+ "parking_lot",
"prometheus-client-derive-encode",
]
@@ -5655,16 +4980,16 @@ version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b6a5217beb0ad503ee7fa752d451c905113d70721b937126158f3106a48cc1"
dependencies = [
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"syn 1.0.95",
]
[[package]]
name = "prost"
-version = "0.11.9"
+version = "0.12.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
+checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29"
dependencies = [
"bytes 1.4.0",
"prost-derive",
@@ -5672,44 +4997,43 @@ dependencies = [
[[package]]
name = "prost-build"
-version = "0.11.9"
+version = "0.12.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270"
+checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
dependencies = [
"bytes 1.4.0",
"heck",
"itertools",
- "lazy_static",
"log",
"multimap",
+ "once_cell",
"petgraph",
"prettyplease",
"prost",
"prost-types",
"regex",
- "syn 1.0.95",
+ "syn 2.0.38",
"tempfile",
- "which",
]
[[package]]
name = "prost-derive"
-version = "0.11.9"
+version = "0.12.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
+checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
dependencies = [
"anyhow",
"itertools",
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
- "syn 1.0.95",
+ "syn 2.0.38",
]
[[package]]
name = "prost-types"
-version = "0.11.9"
+version = "0.12.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13"
+checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0"
dependencies = [
"prost",
]
@@ -5751,15 +5075,6 @@ dependencies = [
"serde_json",
]
-[[package]]
-name = "qstring"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d464fae65fff2680baf48019211ce37aaec0c78e9264c84a3e484717f965104e"
-dependencies = [
- "percent-encoding",
-]
-
[[package]]
name = "quanta"
version = "0.11.1"
@@ -5820,22 +5135,13 @@ version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
-[[package]]
-name = "quote"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-dependencies = [
- "proc-macro2 0.4.30",
-]
-
[[package]]
name = "quote"
version = "1.0.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
dependencies = [
- "proc-macro2 1.0.69",
+ "proc-macro2",
]
[[package]]
@@ -6027,7 +5333,7 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
dependencies = [
- "cloudabi 0.0.3",
+ "cloudabi",
"fuchsia-cprng",
"libc",
"rand_core 0.4.2",
@@ -6073,31 +5379,6 @@ dependencies = [
"bitflags",
]
-[[package]]
-name = "rayon"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
-dependencies = [
- "autocfg 1.1.0",
- "crossbeam-deque 0.8.1",
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
-dependencies = [
- "crossbeam-channel 0.5.1",
- "crossbeam-deque 0.8.1",
- "crossbeam-utils 0.8.16",
- "lazy_static",
- "num_cpus",
-]
-
[[package]]
name = "rcgen"
version = "0.10.0"
@@ -6170,7 +5451,7 @@ version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c523ccaed8ac4b0288948849a350b37d3035827413c458b6a40ddb614bb4f72"
dependencies = [
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"syn 1.0.95",
]
@@ -6331,16 +5612,6 @@ dependencies = [
"serde",
]
-[[package]]
-name = "rpassword"
-version = "5.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb"
-dependencies = [
- "libc",
- "winapi",
-]
-
[[package]]
name = "rpc"
version = "0.1.0"
@@ -6383,7 +5654,7 @@ dependencies = [
"log",
"netlink-packet-route",
"netlink-proto",
- "nix 0.24.3",
+ "nix",
"thiserror",
"tokio",
]
@@ -6600,14 +5871,6 @@ dependencies = [
"winapi-util",
]
-[[package]]
-name = "satomic-swap"
-version = "0.1.0"
-source = "git+https://github.com/KomodoPlatform/satomic-swap.git?rev=413e472#413e4725a97f2c4d5d34101b3d2c49009c95cb28"
-dependencies = [
- "solana-program",
-]
-
[[package]]
name = "scale-info"
version = "2.1.2"
@@ -6626,8 +5889,8 @@ version = "2.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50e334bb10a245e28e5fd755cabcafd96cfcd167c99ae63a46924ca8d8703a3c"
dependencies = [
- "proc-macro-crate 1.1.3",
- "proc-macro2 1.0.69",
+ "proc-macro-crate",
+ "proc-macro2",
"quote 1.0.33",
"syn 1.0.95",
]
@@ -6811,7 +6074,7 @@ dependencies = [
name = "ser_error_derive"
version = "0.1.0"
dependencies = [
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"ser_error",
"syn 1.0.95",
@@ -6852,7 +6115,7 @@ version = "1.0.189"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
dependencies = [
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"syn 2.0.38",
]
@@ -6875,7 +6138,7 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76"
dependencies = [
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"syn 1.0.95",
]
@@ -6909,23 +6172,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
dependencies = [
"darling",
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"syn 1.0.95",
]
-[[package]]
-name = "serde_yaml"
-version = "0.8.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a521f2940385c165a24ee286aa8599633d162077a54bdcae2a6fd5a7bfa7a0"
-dependencies = [
- "indexmap 1.9.3",
- "ryu",
- "serde",
- "yaml-rust",
-]
-
[[package]]
name = "serialization"
version = "0.1.0"
@@ -7087,717 +6338,104 @@ checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
dependencies = [
"autocfg 1.1.0",
]
-
-[[package]]
-name = "smallvec"
-version = "0.6.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0"
-dependencies = [
- "maybe-uninit",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
-
-[[package]]
-name = "smol"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "620cbb3c6e34da57d3a248cda0cd01cd5848164dc062e764e65d06fe3ea7aed5"
-dependencies = [
- "async-task",
- "blocking",
- "concurrent-queue 1.1.1",
- "fastrand",
- "futures-io",
- "futures-util",
- "libc",
- "once_cell",
- "scoped-tls",
- "slab",
- "socket2 0.3.19",
- "wepoll-sys-stjepang",
- "winapi",
-]
-
-[[package]]
-name = "snow"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ccba027ba85743e09d15c03296797cad56395089b832b48b5a5217880f57733"
-dependencies = [
- "aes-gcm",
- "blake2",
- "chacha20poly1305",
- "curve25519-dalek 4.0.0-rc.1",
- "rand_core 0.6.4",
- "ring 0.16.20",
- "rustc_version 0.4.0",
- "sha2 0.10.7",
- "subtle",
-]
-
-[[package]]
-name = "socket2"
-version = "0.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "socket2"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "socket2"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
-dependencies = [
- "libc",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "soketto"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "083624472e8817d44d02c0e55df043737ff11f279af924abdf93845717c2b75c"
-dependencies = [
- "base64 0.13.0",
- "bytes 1.4.0",
- "futures 0.3.28",
- "httparse",
- "log",
- "rand 0.8.4",
- "sha-1",
-]
-
-[[package]]
-name = "solana-account-decoder"
-version = "1.9.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ea8c1862fc46c6ab40d83d15ced24a7afb1f3422da5824f1e9260f5ac10141f"
-dependencies = [
- "Inflector",
- "base64 0.12.3",
- "bincode",
- "bs58 0.4.0",
- "bv",
- "lazy_static",
- "serde",
- "serde_derive",
- "serde_json",
- "solana-config-program",
- "solana-sdk",
- "solana-vote-program",
- "spl-token",
- "thiserror",
- "zstd",
-]
-
-[[package]]
-name = "solana-address-lookup-table-program"
-version = "1.9.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c60728aec35d772e6614319558cdccbe3f845102699b65ba5ac7497da0b626a"
-dependencies = [
- "bincode",
- "bytemuck",
- "log",
- "num-derive",
- "num-traits",
- "rustc_version 0.4.0",
- "serde",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
- "solana-program-runtime",
- "solana-sdk",
- "thiserror",
-]
-
-[[package]]
-name = "solana-bloom"
-version = "1.9.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ddcd7c6adb802bc812a5a80c8de06ba0f0e8df0cca296a8b4e67cd04c16218f"
-dependencies = [
- "bv",
- "fnv",
- "log",
- "rand 0.7.3",
- "rayon",
- "rustc_version 0.4.0",
- "serde",
- "serde_derive",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
- "solana-sdk",
-]
-
-[[package]]
-name = "solana-bucket-map"
-version = "1.9.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3435b145894971a58a08a7b6be997ec782239fdecd5edd9846cd1d6aa5986"
-dependencies = [
- "fs_extra",
- "log",
- "memmap2",
- "rand 0.7.3",
- "rayon",
- "solana-logger",
- "solana-measure",
- "solana-sdk",
- "tempfile",
-]
-
-[[package]]
-name = "solana-clap-utils"
-version = "1.9.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8417a89c377728dbfbf1966b6493544f6e5e168ebc5bb444f3526481fae94e31"
-dependencies = [
- "chrono",
- "clap",
- "rpassword",
- "solana-perf",
- "solana-remote-wallet",
- "solana-sdk",
- "thiserror",
- "tiny-bip39",
- "uriparse",
- "url",
-]
-
-[[package]]
-name = "solana-cli-config"
-version = "1.9.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e8b011d36369ef2bc3dff63fee078bf2916a4fd21f3aa702ee731c7ddf83d28"
-dependencies = [
- "dirs-next",
- "lazy_static",
- "serde",
- "serde_derive",
- "serde_yaml",
- "url",
-]
-
-[[package]]
-name = "solana-client"
-version = "1.9.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e20f4df8cee4a1819f1c5b0d3d85d50c30f27133b2ae68c2fd92655e4aede34a"
-dependencies = [
- "base64 0.13.0",
- "bincode",
- "bs58 0.4.0",
- "clap",
- "indicatif",
- "jsonrpc-core",
- "log",
- "rayon",
- "reqwest",
- "semver 1.0.6",
- "serde",
- "serde_derive",
- "serde_json",
- "solana-account-decoder",
- "solana-clap-utils",
- "solana-faucet",
- "solana-measure",
- "solana-net-utils",
- "solana-sdk",
- "solana-transaction-status",
- "solana-version",
- "solana-vote-program",
- "thiserror",
- "tokio",
- "tungstenite",
- "url",
-]
-
-[[package]]
-name = "solana-compute-budget-program"
-version = "1.9.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "685567c221f6bb5b64387f7b45d03036ad112b2ecbcd0f94b11204efab9f891e"
-dependencies = [
- "solana-program-runtime",
- "solana-sdk",
-]
-
-[[package]]
-name = "solana-config-program"
-version = "1.9.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f4b04403ff77f09eba5cf94078c1178161e26d346245b06180866ab5286fe6b"
-dependencies = [
- "bincode",
- "chrono",
- "serde",
- "serde_derive",
- "solana-program-runtime",
- "solana-sdk",
-]
-
-[[package]]
-name = "solana-faucet"
-version = "1.9.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a11e1b6d5ce435bb3df95f2a970cd80500a8abf94ea87558c35fe0cce8456ab"
-dependencies = [
- "bincode",
- "byteorder",
- "clap",
- "log",
- "serde",
- "serde_derive",
- "solana-clap-utils",
- "solana-cli-config",
- "solana-logger",
- "solana-metrics",
- "solana-sdk",
- "solana-version",
- "spl-memo",
- "thiserror",
- "tokio",
-]
-
-[[package]]
-name = "solana-frozen-abi"
-version = "1.9.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5f69a79200f5ba439eb8b790c5e00beab4d1fae4da69ce023c69c6ac1b55bf1"
-dependencies = [
- "bs58 0.4.0",
- "bv",
- "generic-array",
- "log",
- "memmap2",
- "rustc_version 0.4.0",
- "serde",
- "serde_derive",
- "sha2 0.9.9",
- "solana-frozen-abi-macro",
- "solana-logger",
- "thiserror",
-]
-
-[[package]]
-name = "solana-frozen-abi-macro"
-version = "1.9.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "402fffb54bf5d335e6df26fc1719feecfbd7a22fafdf6649fe78380de3c47384"
-dependencies = [
- "proc-macro2 1.0.69",
- "quote 1.0.33",
- "rustc_version 0.4.0",
- "syn 1.0.95",
-]
-
-[[package]]
-name = "solana-logger"
-version = "1.9.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942dc59fc9da66d178362051b658646b65dc11cea0bc804e4ecd2528d3c1279f"
-dependencies = [
- "env_logger",
- "lazy_static",
- "log",
-]
-
-[[package]]
-name = "solana-measure"
-version = "1.9.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ccd5b1278b115249d6ca5a203fd852f7d856e048488c24442222ee86e682bd9"
-dependencies = [
- "log",
- "solana-sdk",
-]
-
-[[package]]
-name = "solana-metrics"
-version = "1.9.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9774cd8309f599797b1612731fbc56df6c612879ab4923a3dc7234400eea419"
-dependencies = [
- "env_logger",
- "gethostname",
- "lazy_static",
- "log",
- "reqwest",
- "solana-sdk",
-]
-
-[[package]]
-name = "solana-net-utils"
-version = "1.9.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cb530af085d8aab563530ed39703096aa526249d350082823882fdd59cdf839"
-dependencies = [
- "bincode",
- "clap",
- "log",
- "nix 0.23.1",
- "rand 0.7.3",
- "serde",
- "serde_derive",
- "socket2 0.4.9",
- "solana-logger",
- "solana-sdk",
- "solana-version",
- "tokio",
- "url",
-]
-
-[[package]]
-name = "solana-perf"
-version = "1.9.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4117c0cf7753bc18f3a09f4973175c3f2c7c5d8e3c9bc15cab09060b06f3434f"
-dependencies = [
- "ahash 0.7.6",
- "bincode",
- "bv",
- "caps",
- "curve25519-dalek 3.2.0",
- "dlopen",
- "dlopen_derive",
- "fnv",
- "lazy_static",
- "libc",
- "log",
- "nix 0.23.1",
- "rand 0.7.3",
- "rayon",
- "serde",
- "solana-bloom",
- "solana-logger",
- "solana-metrics",
- "solana-rayon-threadlimit",
- "solana-sdk",
- "solana-vote-program",
-]
-
-[[package]]
-name = "solana-program"
-version = "1.9.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a463f546a2f5842d35974bd4691ae5ceded6785ec24db440f773723f6ce4e11"
-dependencies = [
- "base64 0.13.0",
- "bincode",
- "bitflags",
- "blake3",
- "borsh",
- "borsh-derive",
- "bs58 0.4.0",
- "bv",
- "bytemuck",
- "console_error_panic_hook",
- "console_log",
- "curve25519-dalek 3.2.0",
- "getrandom 0.1.14",
- "itertools",
- "js-sys",
- "lazy_static",
- "libsecp256k1 0.6.0",
- "log",
- "num-derive",
- "num-traits",
- "parking_lot 0.11.1",
- "rand 0.7.3",
- "rustc_version 0.4.0",
- "rustversion",
- "serde",
- "serde_bytes",
- "serde_derive",
- "sha2 0.9.9",
- "sha3 0.9.1",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
- "solana-logger",
- "solana-sdk-macro",
- "thiserror",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "solana-program-runtime"
-version = "1.9.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09841673334eab958d5bedab9c9d75ed2ff7a7ef70e7dfd6b239c6838a3d79ec"
-dependencies = [
- "base64 0.13.0",
- "bincode",
- "itertools",
- "libc",
- "libloading",
- "log",
- "num-derive",
- "num-traits",
- "rustc_version 0.4.0",
- "serde",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
- "solana-logger",
- "solana-measure",
- "solana-sdk",
- "thiserror",
-]
-
-[[package]]
-name = "solana-rayon-threadlimit"
-version = "1.9.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f92893e3129dfabb703cd045e1367f3ced91202a2d0b6179a3dcd62ad6bead3b"
-dependencies = [
- "lazy_static",
- "num_cpus",
-]
-
-[[package]]
-name = "solana-remote-wallet"
-version = "1.9.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "315534baecaae3f804548ccc4738d73ae01bf6523219787ebe55ee66d8db9a85"
-dependencies = [
- "base32",
- "console",
- "dialoguer",
- "hidapi",
- "log",
- "num-derive",
- "num-traits",
- "parking_lot 0.11.1",
- "qstring",
- "semver 1.0.6",
- "solana-sdk",
- "thiserror",
- "uriparse",
-]
-
-[[package]]
-name = "solana-runtime"
-version = "1.9.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bd06e905260433f7e8d18bccb2e2eb2aa5cc53379d104d331ddeb12e13230a0"
-dependencies = [
- "arrayref",
- "bincode",
- "blake3",
- "bv",
- "bytemuck",
- "byteorder",
- "bzip2",
- "crossbeam-channel 0.5.1",
- "dashmap",
- "dir-diff",
- "flate2",
- "fnv",
- "index_list",
- "itertools",
- "lazy_static",
- "log",
- "memmap2",
- "num-derive",
- "num-traits",
- "num_cpus",
- "ouroboros",
- "rand 0.7.3",
- "rayon",
- "regex",
- "rustc_version 0.4.0",
- "serde",
- "serde_derive",
- "solana-address-lookup-table-program",
- "solana-bloom",
- "solana-bucket-map",
- "solana-compute-budget-program",
- "solana-config-program",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
- "solana-logger",
- "solana-measure",
- "solana-metrics",
- "solana-program-runtime",
- "solana-rayon-threadlimit",
- "solana-sdk",
- "solana-stake-program",
- "solana-vote-program",
- "symlink",
- "tar",
- "tempfile",
- "thiserror",
- "zstd",
-]
-
-[[package]]
-name = "solana-sdk"
-version = "1.9.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6560e605c68fa1e3e66a9d3c8529d097d402e1183f80dd06a2c870d0ecb795c2"
-dependencies = [
- "assert_matches",
- "base64 0.13.0",
- "bincode",
- "bitflags",
- "borsh",
- "bs58 0.4.0",
- "bytemuck",
- "byteorder",
- "chrono",
- "derivation-path 0.1.3",
- "digest 0.9.0",
- "ed25519-dalek",
- "ed25519-dalek-bip32 0.1.1",
- "generic-array",
- "hmac 0.11.0",
- "itertools",
- "js-sys",
- "lazy_static",
- "libsecp256k1 0.6.0",
- "log",
- "memmap2",
- "num-derive",
- "num-traits",
- "pbkdf2 0.9.0",
- "qstring",
- "rand 0.7.3",
- "rand_chacha 0.2.2",
- "rustc_version 0.4.0",
- "rustversion",
- "serde",
- "serde_bytes",
- "serde_derive",
- "serde_json",
- "sha2 0.9.9",
- "sha3 0.9.1",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
- "solana-logger",
- "solana-program",
- "solana-sdk-macro",
- "thiserror",
- "uriparse",
- "wasm-bindgen",
+
+[[package]]
+name = "smallvec"
+version = "0.6.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0"
+dependencies = [
+ "maybe-uninit",
]
[[package]]
-name = "solana-sdk-macro"
-version = "1.9.20"
+name = "smallvec"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
+
+[[package]]
+name = "smol"
+version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c834b4e02ac911b13c13aed08b3f847e722f6be79d31b1c660c1dbd2dee83cdb"
+checksum = "620cbb3c6e34da57d3a248cda0cd01cd5848164dc062e764e65d06fe3ea7aed5"
dependencies = [
- "bs58 0.4.0",
- "proc-macro2 1.0.69",
- "quote 1.0.33",
- "rustversion",
- "syn 1.0.95",
+ "async-task",
+ "blocking",
+ "concurrent-queue 1.1.1",
+ "fastrand",
+ "futures-io",
+ "futures-util",
+ "libc",
+ "once_cell",
+ "scoped-tls",
+ "slab",
+ "socket2 0.3.19",
+ "wepoll-sys-stjepang",
+ "winapi",
]
[[package]]
-name = "solana-stake-program"
-version = "1.9.20"
+name = "snow"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f92597c0ed16d167d5ee48e5b13e92dfaed9c55b23a13ec261440136cd418649"
+checksum = "5ccba027ba85743e09d15c03296797cad56395089b832b48b5a5217880f57733"
dependencies = [
- "bincode",
- "log",
- "num-derive",
- "num-traits",
+ "aes-gcm",
+ "blake2",
+ "chacha20poly1305",
+ "curve25519-dalek 4.0.0-rc.1",
+ "rand_core 0.6.4",
+ "ring 0.16.20",
"rustc_version 0.4.0",
- "serde",
- "serde_derive",
- "solana-config-program",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
- "solana-metrics",
- "solana-program-runtime",
- "solana-sdk",
- "solana-vote-program",
- "thiserror",
+ "sha2 0.10.7",
+ "subtle",
]
[[package]]
-name = "solana-transaction-status"
-version = "1.9.20"
+name = "socket2"
+version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "612a51efa19380992e81fc64a2fb55d42aed32c67d795848d980cbe1f9693250"
+checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
dependencies = [
- "Inflector",
- "base64 0.12.3",
- "bincode",
- "bs58 0.4.0",
- "lazy_static",
- "log",
- "serde",
- "serde_derive",
- "serde_json",
- "solana-account-decoder",
- "solana-measure",
- "solana-metrics",
- "solana-runtime",
- "solana-sdk",
- "solana-vote-program",
- "spl-associated-token-account",
- "spl-memo",
- "spl-token",
- "thiserror",
+ "cfg-if 1.0.0",
+ "libc",
+ "winapi",
]
[[package]]
-name = "solana-version"
-version = "1.9.20"
+name = "socket2"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222e2c91640d45cd9617dfc07121555a9bdac10e6e105f6931b758f46db6faaa"
+checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
dependencies = [
- "log",
- "rustc_version 0.4.0",
- "serde",
- "serde_derive",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
- "solana-sdk",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "socket2"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
+dependencies = [
+ "libc",
+ "windows-sys 0.48.0",
]
[[package]]
-name = "solana-vote-program"
-version = "1.9.20"
+name = "soketto"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4cc64945010e9e76d368493ad091aa5cf43ee16f69296290ebb5c815e433232"
+checksum = "083624472e8817d44d02c0e55df043737ff11f279af924abdf93845717c2b75c"
dependencies = [
- "bincode",
+ "base64 0.13.0",
+ "bytes 1.4.0",
+ "futures 0.3.28",
+ "httparse",
"log",
- "num-derive",
- "num-traits",
- "rustc_version 0.4.0",
- "serde",
- "serde_derive",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
- "solana-logger",
- "solana-metrics",
- "solana-program-runtime",
- "solana-sdk",
- "thiserror",
+ "rand 0.8.4",
+ "sha-1",
]
[[package]]
@@ -7831,7 +6469,7 @@ version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d676664972e22a0796176e81e7bec41df461d1edf52090955cdab55f2c956ff2"
dependencies = [
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"syn 1.0.95",
]
@@ -7860,8 +6498,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22ecb916b9664ed9f90abef0ff5a3e61454c1efea5861b2997e03f39b59b955f"
dependencies = [
"Inflector",
- "proc-macro-crate 1.1.3",
- "proc-macro2 1.0.69",
+ "proc-macro-crate",
+ "proc-macro2",
"quote 1.0.33",
"syn 1.0.95",
]
@@ -7945,39 +6583,6 @@ dependencies = [
"der",
]
-[[package]]
-name = "spl-associated-token-account"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "393e2240d521c3dd770806bff25c2c00d761ac962be106e14e22dd912007f428"
-dependencies = [
- "solana-program",
- "spl-token",
-]
-
-[[package]]
-name = "spl-memo"
-version = "3.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd0dc6f70db6bacea7ff25870b016a65ba1d1b6013536f08e4fd79a8f9005325"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "spl-token"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93bfdd5bd7c869cb565c7d7635c4fafe189b988a0bdef81063cd9585c6b8dc01"
-dependencies = [
- "arrayref",
- "num-derive",
- "num-traits",
- "num_enum",
- "solana-program",
- "thiserror",
-]
-
[[package]]
name = "spv_validation"
version = "0.1.0"
@@ -8015,31 +6620,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f9799e6d412271cb2414597581128b03f3285f260ea49f5363d07df6a332b3e"
dependencies = [
"Inflector",
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"serde",
"serde_json",
"unicode-xid 0.2.0",
]
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
[[package]]
name = "static_assertions"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
[[package]]
name = "strsim"
version = "0.10.0"
@@ -8067,12 +6660,6 @@ version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142"
-[[package]]
-name = "symlink"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7973cce6668464ea31f176d85b13c7ab3bba2cb3b77a2ed26abd7801688010a"
-
[[package]]
name = "syn"
version = "0.11.11"
@@ -8084,24 +6671,13 @@ dependencies = [
"unicode-xid 0.0.4",
]
-[[package]]
-name = "syn"
-version = "0.15.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-dependencies = [
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "unicode-xid 0.1.0",
-]
-
[[package]]
name = "syn"
version = "1.0.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942"
dependencies = [
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"unicode-ident",
]
@@ -8112,7 +6688,7 @@ version = "2.0.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
dependencies = [
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"unicode-ident",
]
@@ -8138,7 +6714,7 @@ version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
dependencies = [
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"syn 1.0.95",
"unicode-xid 0.2.0",
@@ -8171,17 +6747,6 @@ version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
-[[package]]
-name = "tar"
-version = "0.4.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6"
-dependencies = [
- "filetime",
- "libc",
- "xattr",
-]
-
[[package]]
name = "tempfile"
version = "3.4.0"
@@ -8197,9 +6762,9 @@ dependencies = [
[[package]]
name = "tendermint"
-version = "0.32.2"
+version = "0.34.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f0a7d05cf78524782337f8edd55cbc578d159a16ad4affe2135c92f7dbac7f0"
+checksum = "15ab8f0a25d0d2ad49ac615da054d6a76aa6603ff95f7d18bafdd34450a1a04b"
dependencies = [
"bytes 1.4.0",
"digest 0.10.7",
@@ -8228,9 +6793,9 @@ dependencies = [
[[package]]
name = "tendermint-config"
-version = "0.32.2"
+version = "0.34.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71a72dbbea6dde12045d261f2c70c0de039125675e8a026c8d5ad34522756372"
+checksum = "e1a02da769166e2052cd537b1a97c78017632c2d9e19266367b27e73910434fc"
dependencies = [
"flex-error",
"serde",
@@ -8242,9 +6807,9 @@ dependencies = [
[[package]]
name = "tendermint-proto"
-version = "0.32.2"
+version = "0.34.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0cec054567d16d85e8c3f6a3139963d1a66d9d3051ed545d31562550e9bcc3d"
+checksum = "b797dd3d2beaaee91d2f065e7bdf239dc8d80bba4a183a288bc1279dd5a69a1e"
dependencies = [
"bytes 1.4.0",
"flex-error",
@@ -8260,9 +6825,9 @@ dependencies = [
[[package]]
name = "tendermint-rpc"
-version = "0.32.2"
+version = "0.34.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d119d83a130537fc4a98c3c9eb6899ebe857fea4860400a61675bfb5f0b35129"
+checksum = "71afae8bb5f6b14ed48d4e1316a643b6c2c3cbad114f510be77b4ed20b7b3e42"
dependencies = [
"async-trait",
"bytes 1.4.0",
@@ -8270,6 +6835,7 @@ dependencies = [
"getrandom 0.2.9",
"peg",
"pin-project",
+ "rand 0.8.4",
"semver 1.0.6",
"serde",
"serde_bytes",
@@ -8282,7 +6848,7 @@ dependencies = [
"thiserror",
"time 0.3.20",
"url",
- "uuid 0.8.2",
+ "uuid",
"walkdir",
]
@@ -8295,16 +6861,6 @@ dependencies = [
"winapi-util",
]
-[[package]]
-name = "terminal_size"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df"
-dependencies = [
- "libc",
- "winapi",
-]
-
[[package]]
name = "test_helpers"
version = "0.1.0"
@@ -8329,15 +6885,6 @@ dependencies = [
"sha2 0.10.7",
]
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
[[package]]
name = "thiserror"
version = "1.0.40"
@@ -8353,7 +6900,7 @@ version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"syn 2.0.38",
]
@@ -8396,25 +6943,6 @@ dependencies = [
"time-core",
]
-[[package]]
-name = "tiny-bip39"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc59cb9dfc85bb312c3a78fd6aa8a8582e310b0fa885d5bb877f6dcc601839d"
-dependencies = [
- "anyhow",
- "hmac 0.8.1",
- "once_cell",
- "pbkdf2 0.4.0",
- "rand 0.7.3",
- "rustc-hash",
- "sha2 0.9.9",
- "thiserror",
- "unicode-normalization",
- "wasm-bindgen",
- "zeroize",
-]
-
[[package]]
name = "tiny-keccak"
version = "1.4.4"
@@ -8459,7 +6987,6 @@ dependencies = [
"libc",
"mio",
"num_cpus",
- "parking_lot 0.12.0",
"pin-project-lite 0.2.9",
"signal-hook-registry",
"socket2 0.4.9",
@@ -8493,7 +7020,7 @@ version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"syn 2.0.38",
]
@@ -8588,9 +7115,9 @@ dependencies = [
[[package]]
name = "tonic"
-version = "0.9.2"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a"
+checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e"
dependencies = [
"async-stream",
"async-trait",
@@ -8598,8 +7125,6 @@ dependencies = [
"base64 0.21.7",
"bytes 1.4.0",
"flate2",
- "futures-core",
- "futures-util",
"h2",
"http 0.2.12",
"http-body 0.4.5",
@@ -8608,6 +7133,7 @@ dependencies = [
"percent-encoding",
"pin-project",
"prost",
+ "rustls 0.21.10",
"rustls-pemfile 1.0.2",
"tokio",
"tokio-rustls 0.24.1",
@@ -8616,20 +7142,20 @@ dependencies = [
"tower-layer",
"tower-service",
"tracing",
- "webpki-roots 0.23.1",
+ "webpki-roots 0.25.4",
]
[[package]]
name = "tonic-build"
-version = "0.9.2"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07"
+checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889"
dependencies = [
"prettyplease",
- "proc-macro2 1.0.69",
+ "proc-macro2",
"prost-build",
"quote 1.0.33",
- "syn 1.0.95",
+ "syn 2.0.38",
]
[[package]]
@@ -8682,7 +7208,7 @@ version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
dependencies = [
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"syn 2.0.38",
]
@@ -8786,7 +7312,7 @@ dependencies = [
"futures-channel",
"futures-io",
"futures-util",
- "idna",
+ "idna 0.2.3",
"ipnet",
"lazy_static",
"rand 0.8.4",
@@ -8810,7 +7336,7 @@ dependencies = [
"ipconfig",
"lazy_static",
"lru-cache",
- "parking_lot 0.12.0",
+ "parking_lot",
"resolv-conf",
"smallvec 1.6.1",
"thiserror",
@@ -8844,7 +7370,6 @@ dependencies = [
"url",
"utf-8",
"webpki",
- "webpki-roots 0.22.3",
]
[[package]]
@@ -8872,12 +7397,9 @@ source = "git+https://github.com/KomodoPlatform/mm2-parity-ethereum.git?rev=mm2-
[[package]]
name = "unicode-bidi"
-version = "0.3.4"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-dependencies = [
- "matches",
-]
+checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
[[package]]
name = "unicode-ident"
@@ -8887,9 +7409,9 @@ checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee"
[[package]]
name = "unicode-normalization"
-version = "0.1.19"
+version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
dependencies = [
"tinyvec",
]
@@ -8906,12 +7428,6 @@ version = "0.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
-[[package]]
-name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-
[[package]]
name = "unicode-xid"
version = "0.2.0"
@@ -8950,25 +7466,14 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
-[[package]]
-name = "uriparse"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e515b1ada404168e145ac55afba3c42f04cf972201a8552d42e2abb17c1b7221"
-dependencies = [
- "fnv",
- "lazy_static",
-]
-
[[package]]
name = "url"
-version = "2.2.2"
+version = "2.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
dependencies = [
"form_urlencoded",
- "idna",
- "matches",
+ "idna 0.5.0",
"percent-encoding",
"serde",
]
@@ -8999,15 +7504,9 @@ dependencies = [
[[package]]
name = "uuid"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
-
-[[package]]
-name = "uuid"
-version = "1.2.2"
+version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c"
+checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
dependencies = [
"getrandom 0.2.9",
"rand 0.8.4",
@@ -9026,12 +7525,6 @@ version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c"
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
[[package]]
name = "version_check"
version = "0.9.4"
@@ -9152,7 +7645,7 @@ dependencies = [
"bumpalo",
"log",
"once_cell",
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"syn 2.0.38",
"wasm-bindgen-shared",
@@ -9186,7 +7679,7 @@ version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"syn 2.0.38",
"wasm-bindgen-backend",
@@ -9219,7 +7712,7 @@ version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c2e18093f11c19ca4e188c177fecc7c372304c311189f12c2f9bea5b7324ac7"
dependencies = [
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
]
@@ -9249,11 +7742,11 @@ dependencies = [
"getrandom 0.2.9",
"headers",
"hex",
- "idna",
+ "idna 0.2.3",
"js-sys",
"jsonrpc-core",
"log",
- "parking_lot 0.12.0",
+ "parking_lot",
"pin-project",
"rand 0.8.4",
"reqwest",
@@ -9310,16 +7803,6 @@ dependencies = [
"cc",
]
-[[package]]
-name = "which"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b55551e42cbdf2ce2bedd2203d0cc08dba002c27510f86dab6d0ce304cba3dfe"
-dependencies = [
- "either",
- "libc",
-]
-
[[package]]
name = "widestring"
version = "0.5.1"
@@ -9625,24 +8108,6 @@ dependencies = [
"zeroize",
]
-[[package]]
-name = "xattr"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "yaml-rust"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
-dependencies = [
- "linked-hash-map",
-]
-
[[package]]
name = "yamux"
version = "0.12.1"
@@ -9652,7 +8117,7 @@ dependencies = [
"futures 0.3.28",
"log",
"nohash-hasher",
- "parking_lot 0.12.0",
+ "parking_lot",
"pin-project",
"rand 0.8.4",
"static_assertions",
@@ -9668,7 +8133,7 @@ dependencies = [
"instant",
"log",
"nohash-hasher",
- "parking_lot 0.12.0",
+ "parking_lot",
"pin-project",
"rand 0.8.4",
"static_assertions",
@@ -9829,37 +8294,8 @@ version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17"
dependencies = [
- "proc-macro2 1.0.69",
+ "proc-macro2",
"quote 1.0.33",
"syn 1.0.95",
"synstructure",
]
-
-[[package]]
-name = "zstd"
-version = "0.9.2+zstd.1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2390ea1bf6c038c39674f22d95f0564725fc06034a47129179810b2fc58caa54"
-dependencies = [
- "zstd-safe",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "4.1.3+zstd.1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e99d81b99fb3c2c2c794e3fe56c305c63d5173a16a46b5850b07c935ffc7db79"
-dependencies = [
- "libc",
- "zstd-sys",
-]
-
-[[package]]
-name = "zstd-sys"
-version = "1.6.2+zstd.1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2daf2f248d9ea44454bfcb2516534e8b8ad2fc91bf818a1885495fc42bc8ac9f"
-dependencies = [
- "cc",
- "libc",
-]
diff --git a/Cargo.toml b/Cargo.toml
index 32d349dcb0..e11491ec32 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -60,7 +60,7 @@ opt-level = 3
strip = true
codegen-units = 1
# lto = true
-panic = "abort"
+panic = 'unwind'
[profile.dev]
opt-level = 0
diff --git a/README.md b/README.md
index 0d91d3cded..441c23ba8c 100755
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@
## 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, decentralised, 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/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.
There is no 3rd party intermediary, no proxy tokens, and at all times users remain in sole possession of their private keys.
@@ -172,7 +172,7 @@ Refer to the [Komodo Developer Docs](https://developers.komodoplatform.com/basic
## Project structure
-[mm2src](mm2src) - Rust code, contains some parts ported from C `as is` (e.g. `lp_ordermatch`) to reach the most essential/error prone code. Some other modules/crates are reimplemented from scratch.
+[mm2src](mm2src) - Rust code, contains some parts ported from C `as is` (e.g. `lp_ordermatch`) to reach the most essential/error-prone code. Some other modules/crates are reimplemented from scratch.
## Additional docs for developers
@@ -185,12 +185,13 @@ Refer to the [Komodo Developer Docs](https://developers.komodoplatform.com/basic
## Disclaimer
-This repository contains the `work in progress` code of the brand new Komodo DeFi Framework (kdf) built mainly on Rust.
-The current state can be considered as a alpha version.
+This repository contains the `work in progress` code of the brand-new Komodo DeFi Framework (kdf) built mainly on Rust.
+The current state can be considered as an alpha version.
**WARNING: Use with test coins only or with assets which value does not exceed an amount you are willing to lose. This is alpha stage software! **
## 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/artemii235/SuperNET/issues/new) 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-marketmaker` channel.
+
diff --git a/clippy.toml b/clippy.toml
new file mode 100644
index 0000000000..068d7e886b
--- /dev/null
+++ b/clippy.toml
@@ -0,0 +1,4 @@
+[[disallowed-methods]]
+path = "futures::future::Future::wait"
+replacement = "common::block_on_f01"
+reason = "Use the default KDF async executor."
\ No newline at end of file
diff --git a/mm2src/adex_cli/README.md b/mm2src/adex_cli/README.md
new file mode 100644
index 0000000000..6066b2c0bc
--- /dev/null
+++ b/mm2src/adex_cli/README.md
@@ -0,0 +1,3 @@
+## ⚠️ Deprecated
+
+**The `adex-cli` tool is no longer maintained and has been deprecated.**
\ No newline at end of file
diff --git a/mm2src/coins/Cargo.toml b/mm2src/coins/Cargo.toml
index c870e9baf0..8fa02034c1 100644
--- a/mm2src/coins/Cargo.toml
+++ b/mm2src/coins/Cargo.toml
@@ -5,17 +5,6 @@ edition = "2018"
[features]
zhtlc-native-tests = []
-# TODO
-enable-solana = [
- "dep:bincode",
- "dep:ed25519-dalek-bip32",
- "dep:solana-client",
- "dep:solana-sdk",
- "dep:solana-transaction-status",
- "dep:spl-token",
- "dep:spl-associated-token-account",
- "dep:satomic-swap"
-]
enable-sia = [
"dep:reqwest",
"dep:blake2b_simd",
@@ -44,7 +33,7 @@ cfg-if = "1.0"
chain = { path = "../mm2_bitcoin/chain" }
chrono = { version = "0.4.23", "features" = ["serde"] }
common = { path = "../common" }
-cosmrs = { version = "0.14.0", default-features = false }
+cosmrs = { version = "0.15", default-features = false }
crossbeam = "0.8"
crypto = { path = "../crypto" }
db_common = { path = "../db_common" }
@@ -86,7 +75,7 @@ mocktopus = "0.8.0"
num-traits = "0.2"
parking_lot = { version = "0.12.0", features = ["nightly"] }
primitives = { path = "../mm2_bitcoin/primitives" }
-prost = "0.11"
+prost = "0.12"
protobuf = "2.20"
proxy_signature = { path = "../proxy_signature" }
rand = { version = "0.7", features = ["std", "small_rng"] }
@@ -96,7 +85,6 @@ rlp = { version = "0.5" }
rmp-serde = "0.14.3"
rpc = { path = "../mm2_bitcoin/rpc" }
rpc_task = { path = "../rpc_task" }
-satomic-swap = { git = "https://github.com/KomodoPlatform/satomic-swap.git", rev = "413e472", optional = true }
script = { path = "../mm2_bitcoin/script" }
secp256k1 = { version = "0.20" }
ser_error = { path = "../derives/ser_error" }
@@ -113,7 +101,7 @@ sha2 = "0.10"
sha3 = "0.9"
utxo_signer = { path = "utxo_signer" }
# using the same version as cosmrs
-tendermint-rpc = { version = "0.32.0", default-features = false }
+tendermint-rpc = { version = "0.34", 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"] }
@@ -125,15 +113,6 @@ zcash_client_backend = { git = "https://github.com/KomodoPlatform/librustzcash.g
zcash_extras = { git = "https://github.com/KomodoPlatform/librustzcash.git", tag = "k-1.4.1" }
zcash_primitives = {features = ["transparent-inputs"], git = "https://github.com/KomodoPlatform/librustzcash.git", tag = "k-1.4.1" }
-[target.'cfg(all(not(target_os = "ios"), not(target_os = "android"), not(target_arch = "wasm32")))'.dependencies]
-bincode = { version = "1.3.3", default-features = false, optional = true }
-ed25519-dalek-bip32 = { version = "0.2.0", default-features = false, optional = true }
-solana-client = { version = "1", default-features = false, optional = true }
-solana-sdk = { version = "1", default-features = false, optional = true }
-solana-transaction-status = { version = "1", optional = true }
-spl-token = { version = "3", optional = true }
-spl-associated-token-account = { version = "1", optional = true }
-
[target.'cfg(target_arch = "wasm32")'.dependencies]
blake2b_simd = "0.5"
ff = "0.8"
@@ -145,7 +124,7 @@ 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"] }
-tonic = { version = "0.9", default-features = false, features = ["prost", "codegen", "gzip"] }
+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" }
@@ -170,7 +149,7 @@ rustls = { version = "0.21", features = ["dangerous_configuration"] }
secp256k1v24 = { version = "0.24", package = "secp256k1" }
tokio = { version = "1.20" }
tokio-rustls = { version = "0.24" }
-tonic = { version = "0.9", features = ["tls", "tls-webpki-roots", "gzip"] }
+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.1" }
zcash_proofs = { git = "https://github.com/KomodoPlatform/librustzcash.git", tag = "k-1.4.1", default-features = false, features = ["local-prover", "multicore"] }
@@ -185,5 +164,5 @@ mm2_test_helpers = { path = "../mm2_test_helpers" }
wagyu-zcash-parameters = { version = "0.2" }
[build-dependencies]
-prost-build = { version = "0.11", default-features = false }
-tonic-build = { version = "0.9", default-features = false, features = ["prost"] }
+prost-build = { version = "0.12", default-features = false }
+tonic-build = { version = "0.10", default-features = false, features = ["prost"] }
diff --git a/mm2src/coins/eth/eth_tests.rs b/mm2src/coins/eth/eth_tests.rs
index 9332594931..03705ff4ca 100644
--- a/mm2src/coins/eth/eth_tests.rs
+++ b/mm2src/coins/eth/eth_tests.rs
@@ -1,27 +1,31 @@
use super::*;
-use crate::eth::for_tests::{eth_coin_for_test, eth_coin_from_keypair};
-use crate::{DexFee, IguanaPrivKey};
-use common::{block_on, now_sec};
-#[cfg(not(target_arch = "wasm32"))]
-use ethkey::{Generator, Random};
+use crate::IguanaPrivKey;
+use common::{block_on, block_on_f01};
use mm2_core::mm_ctx::MmCtxBuilder;
-use mm2_test_helpers::for_tests::{ETH_MAINNET_CHAIN_ID, ETH_MAINNET_NODE, ETH_SEPOLIA_CHAIN_ID, ETH_SEPOLIA_NODES,
+
+cfg_native!(
+ use crate::eth::for_tests::{eth_coin_for_test, eth_coin_from_keypair};
+ use crate::DexFee;
+
+ use common::now_sec;
+ use ethkey::{Generator, Random};
+ use mm2_test_helpers::for_tests::{ETH_MAINNET_CHAIN_ID, ETH_MAINNET_NODE, ETH_SEPOLIA_CHAIN_ID, ETH_SEPOLIA_NODES,
ETH_SEPOLIA_TOKEN_CONTRACT};
-use mocktopus::mocking::*;
-
-/// The gas price for the tests
-const GAS_PRICE: u64 = 50_000_000_000;
-// `GAS_PRICE` increased by 3%
-const GAS_PRICE_APPROXIMATION_ON_START_SWAP: u64 = 51_500_000_000;
-// `GAS_PRICE` increased by 5%
-const GAS_PRICE_APPROXIMATION_ON_ORDER_ISSUE: u64 = 52_500_000_000;
-// `GAS_PRICE` increased by 7%
-const GAS_PRICE_APPROXIMATION_ON_TRADE_PREIMAGE: u64 = 53_500_000_000;
+ use mocktopus::mocking::*;
+
+ /// The gas price for the tests
+ const GAS_PRICE: u64 = 50_000_000_000;
+ /// `GAS_PRICE` increased by 3%
+ const GAS_PRICE_APPROXIMATION_ON_START_SWAP: u64 = 51_500_000_000;
+ /// `GAS_PRICE` increased by 5%
+ const GAS_PRICE_APPROXIMATION_ON_ORDER_ISSUE: u64 = 52_500_000_000;
+ /// `GAS_PRICE` increased by 7%
+ const GAS_PRICE_APPROXIMATION_ON_TRADE_PREIMAGE: u64 = 53_500_000_000;
+);
+
// 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 TAKER_PAYMENT_SPEND_SEARCH_INTERVAL: f64 = 1.;
-
fn check_sum(addr: &str, expected: &str) {
let actual = checksum_address(addr);
assert_eq!(expected, actual);
@@ -154,8 +158,11 @@ fn test_wei_from_big_decimal() {
assert_eq!(expected_wei, wei);
}
+#[cfg(not(target_arch = "wasm32"))]
#[test]
fn test_wait_for_payment_spend_timeout() {
+ const TAKER_PAYMENT_SPEND_SEARCH_INTERVAL: f64 = 1.;
+
EthCoin::spend_events.mock_safe(|_, _, _, _| MockResult::Return(Box::new(futures01::future::ok(vec![]))));
EthCoin::current_block.mock_safe(|_| MockResult::Return(Box::new(futures01::future::ok(900))));
@@ -184,18 +191,16 @@ fn test_wait_for_payment_spend_timeout() {
184, 42, 106,
];
- assert!(coin
- .wait_for_htlc_tx_spend(WaitForHTLCTxSpendArgs {
- tx_bytes: &tx_bytes,
- secret_hash: &[],
- wait_until,
- from_block,
- swap_contract_address: &coin.swap_contract_address(),
- check_every: TAKER_PAYMENT_SPEND_SEARCH_INTERVAL,
- watcher_reward: false
- })
- .wait()
- .is_err());
+ assert!(block_on_f01(coin.wait_for_htlc_tx_spend(WaitForHTLCTxSpendArgs {
+ tx_bytes: &tx_bytes,
+ secret_hash: &[],
+ wait_until,
+ from_block,
+ swap_contract_address: &coin.swap_contract_address(),
+ check_every: TAKER_PAYMENT_SPEND_SEARCH_INTERVAL,
+ watcher_reward: false
+ }))
+ .is_err());
}
#[cfg(not(target_arch = "wasm32"))]
@@ -222,7 +227,7 @@ fn test_withdraw_impl_manual_fee() {
memo: None,
ibc_source_channel: None,
};
- coin.get_balance().wait().unwrap();
+ block_on_f01(coin.get_balance()).unwrap();
let tx_details = block_on(withdraw_impl(coin, withdraw_req)).unwrap();
let expected = Some(
@@ -271,7 +276,7 @@ fn test_withdraw_impl_fee_details() {
memo: None,
ibc_source_channel: None,
};
- coin.get_balance().wait().unwrap();
+ block_on_f01(coin.get_balance()).unwrap();
let tx_details = block_on(withdraw_impl(coin, withdraw_req)).unwrap();
let expected = Some(
@@ -306,6 +311,7 @@ fn test_add_ten_pct_one_gwei() {
assert_eq!(expected, actual);
}
+#[cfg(not(target_arch = "wasm32"))]
#[test]
fn get_sender_trade_preimage() {
/// Trade fee for the ETH coin is `2 * 150_000 * gas_price` always.
@@ -361,6 +367,7 @@ fn get_sender_trade_preimage() {
assert_eq!(actual, expected);
}
+#[cfg(not(target_arch = "wasm32"))]
#[test]
fn get_erc20_sender_trade_preimage() {
const APPROVE_GAS_LIMIT: u64 = 60_000;
@@ -463,6 +470,7 @@ fn get_erc20_sender_trade_preimage() {
);
}
+#[cfg(not(target_arch = "wasm32"))]
#[test]
fn get_receiver_trade_preimage() {
EthCoin::get_gas_price.mock_safe(|_| MockResult::Return(Box::pin(futures::future::ok(GAS_PRICE.into()))));
@@ -476,13 +484,12 @@ fn get_receiver_trade_preimage() {
paid_from_trading_vol: false,
};
- let actual = coin
- .get_receiver_trade_fee(FeeApproxStage::WithoutApprox)
- .wait()
- .expect("!get_sender_trade_fee");
+ let actual =
+ block_on_f01(coin.get_receiver_trade_fee(FeeApproxStage::WithoutApprox)).expect("!get_sender_trade_fee");
assert_eq!(actual, expected_fee);
}
+#[cfg(not(target_arch = "wasm32"))]
#[test]
fn test_get_fee_to_send_taker_fee() {
const DEX_FEE_AMOUNT: u64 = 100_000;
@@ -533,6 +540,7 @@ fn test_get_fee_to_send_taker_fee() {
///
/// Please note this test doesn't work correctly now,
/// because as of now [`EthCoin::get_fee_to_send_taker_fee`] doesn't process the `Exception` web3 error correctly.
+#[cfg(not(target_arch = "wasm32"))]
#[test]
#[ignore]
fn test_get_fee_to_send_taker_fee_insufficient_balance() {
@@ -562,6 +570,7 @@ fn test_get_fee_to_send_taker_fee_insufficient_balance() {
);
}
+#[cfg(not(target_arch = "wasm32"))]
#[test]
fn validate_dex_fee_invalid_sender_eth() {
let (_ctx, coin) = eth_coin_for_test(EthCoinType::Eth, &[ETH_MAINNET_NODE], None, ETH_MAINNET_CHAIN_ID);
@@ -582,13 +591,16 @@ fn validate_dex_fee_invalid_sender_eth() {
min_block_number: 0,
uuid: &[],
};
- let error = coin.validate_fee(validate_fee_args).wait().unwrap_err().into_inner();
+ let error = block_on_f01(coin.validate_fee(validate_fee_args))
+ .unwrap_err()
+ .into_inner();
match error {
ValidatePaymentError::WrongPaymentTx(err) => assert!(err.contains("was sent from wrong address")),
_ => panic!("Expected `WrongPaymentTx` wrong sender address, found {:?}", error),
}
}
+#[cfg(not(target_arch = "wasm32"))]
#[test]
fn validate_dex_fee_invalid_sender_erc() {
let (_ctx, coin) = eth_coin_for_test(
@@ -617,13 +629,16 @@ fn validate_dex_fee_invalid_sender_erc() {
min_block_number: 0,
uuid: &[],
};
- let error = coin.validate_fee(validate_fee_args).wait().unwrap_err().into_inner();
+ let error = block_on_f01(coin.validate_fee(validate_fee_args))
+ .unwrap_err()
+ .into_inner();
match error {
ValidatePaymentError::WrongPaymentTx(err) => assert!(err.contains("was sent from wrong address")),
_ => panic!("Expected `WrongPaymentTx` wrong sender address, found {:?}", error),
}
}
+#[cfg(not(target_arch = "wasm32"))]
fn sender_compressed_pub(tx: &SignedEthTx) -> [u8; 33] {
let tx_pubkey = tx.public.unwrap();
let mut raw_pubkey = [0; 65];
@@ -633,6 +648,7 @@ fn sender_compressed_pub(tx: &SignedEthTx) -> [u8; 33] {
secp_public.serialize()
}
+#[cfg(not(target_arch = "wasm32"))]
#[test]
fn validate_dex_fee_eth_confirmed_before_min_block() {
let (_ctx, coin) = eth_coin_for_test(EthCoinType::Eth, &[ETH_MAINNET_NODE], None, ETH_MAINNET_CHAIN_ID);
@@ -655,13 +671,16 @@ fn validate_dex_fee_eth_confirmed_before_min_block() {
min_block_number: 11784793,
uuid: &[],
};
- let error = coin.validate_fee(validate_fee_args).wait().unwrap_err().into_inner();
+ let error = block_on_f01(coin.validate_fee(validate_fee_args))
+ .unwrap_err()
+ .into_inner();
match error {
ValidatePaymentError::WrongPaymentTx(err) => assert!(err.contains("confirmed before min_block")),
_ => panic!("Expected `WrongPaymentTx` early confirmation, found {:?}", error),
}
}
+#[cfg(not(target_arch = "wasm32"))]
#[test]
fn validate_dex_fee_erc_confirmed_before_min_block() {
let (_ctx, coin) = eth_coin_for_test(
@@ -693,13 +712,16 @@ fn validate_dex_fee_erc_confirmed_before_min_block() {
min_block_number: 11823975,
uuid: &[],
};
- let error = coin.validate_fee(validate_fee_args).wait().unwrap_err().into_inner();
+ let error = block_on_f01(coin.validate_fee(validate_fee_args))
+ .unwrap_err()
+ .into_inner();
match error {
ValidatePaymentError::WrongPaymentTx(err) => assert!(err.contains("confirmed before min_block")),
_ => panic!("Expected `WrongPaymentTx` early confirmation, found {:?}", error),
}
}
+#[cfg(not(target_arch = "wasm32"))]
#[test]
fn test_negotiate_swap_contract_addr_no_fallback() {
let (_, coin) = eth_coin_for_test(EthCoinType::Eth, &[ETH_MAINNET_NODE], None, ETH_MAINNET_CHAIN_ID);
@@ -727,6 +749,7 @@ fn test_negotiate_swap_contract_addr_no_fallback() {
assert_eq!(Some(slice.to_vec().into()), result);
}
+#[cfg(not(target_arch = "wasm32"))]
#[test]
fn test_negotiate_swap_contract_addr_has_fallback() {
let fallback = Address::from_str("0x8500AFc0bc5214728082163326C2FF0C73f4a871").unwrap();
@@ -815,15 +838,14 @@ fn polygon_check_if_my_payment_sent() {
amount: &BigDecimal::default(),
payment_instructions: &None,
};
- let my_payment = coin
- .check_if_my_payment_sent(if_my_payment_sent_args)
- .wait()
+ let my_payment = block_on_f01(coin.check_if_my_payment_sent(if_my_payment_sent_args))
.unwrap()
.unwrap();
let expected_hash = BytesJson::from("69a20008cea0c15ee483b5bbdff942752634aa072dfd2ff715fe87eec302de11");
assert_eq!(expected_hash, my_payment.tx_hash_as_bytes());
}
+#[cfg(not(target_arch = "wasm32"))]
#[test]
fn test_message_hash() {
let key_pair = Random.generate().unwrap();
@@ -842,6 +864,7 @@ fn test_message_hash() {
);
}
+#[cfg(not(target_arch = "wasm32"))]
#[test]
fn test_sign_verify_message() {
let key_pair = KeyPair::from_secret_slice(
@@ -866,6 +889,7 @@ fn test_sign_verify_message() {
assert!(is_valid);
}
+#[cfg(not(target_arch = "wasm32"))]
#[test]
fn test_eth_extract_secret() {
let key_pair = Random.generate().unwrap();
diff --git a/mm2src/coins/eth/web3_transport/websocket_transport.rs b/mm2src/coins/eth/web3_transport/websocket_transport.rs
index d17ef99d7e..fd1220e92e 100644
--- a/mm2src/coins/eth/web3_transport/websocket_transport.rs
+++ b/mm2src/coins/eth/web3_transport/websocket_transport.rs
@@ -97,12 +97,7 @@ impl WebsocketTransport {
}
}
- async fn handle_keepalive(
- &self,
- wsocket: &mut WebSocketStream,
- response_notifiers: &mut ExpirableMap>>,
- expires_at: Option,
- ) -> OuterAction {
+ async fn handle_keepalive(&self, wsocket: &mut WebSocketStream, expires_at: Option) -> OuterAction {
const SIMPLE_REQUEST: &str = r#"{"jsonrpc":"2.0","method":"net_version","params":[],"id": 0 }"#;
if let Some(expires_at) = expires_at {
@@ -112,10 +107,7 @@ impl WebsocketTransport {
}
}
- // Drop expired response notifier channels
- response_notifiers.clear_expired_entries();
-
- let mut should_continue = Default::default();
+ let mut should_continue = false;
for _ in 0..MAX_ATTEMPTS {
match wsocket
.send(tokio_tungstenite_wasm::Message::Text(SIMPLE_REQUEST.to_string()))
@@ -206,9 +198,6 @@ impl WebsocketTransport {
}
if let Some(id) = inc_event.get("id") {
- // just to ensure we don't have outdated entries
- response_notifiers.clear_expired_entries();
-
let request_id = id.as_u64().unwrap_or_default() as usize;
if let Some(notifier) = response_notifiers.remove(&request_id) {
@@ -279,7 +268,7 @@ impl WebsocketTransport {
loop {
futures_util::select! {
_ = keepalive_interval.next().fuse() => {
- match self.handle_keepalive(&mut wsocket, &mut response_notifiers, expires_at).await {
+ match self.handle_keepalive(&mut wsocket, expires_at).await {
OuterAction::None => {},
OuterAction::Continue => continue,
OuterAction::Break => break,
diff --git a/mm2src/coins/lightning/ln_platform.rs b/mm2src/coins/lightning/ln_platform.rs
index 4d0573af95..0a5fae0a4f 100644
--- a/mm2src/coins/lightning/ln_platform.rs
+++ b/mm2src/coins/lightning/ln_platform.rs
@@ -15,7 +15,7 @@ use bitcoin::hash_types::{BlockHash, TxMerkleNode, Txid};
use bitcoin_hashes::{sha256d, Hash};
use common::executor::{abortable_queue::AbortableQueue, AbortableSystem, SpawnFuture, Timer};
use common::log::{debug, error, info};
-use common::wait_until_sec;
+use common::{block_on_f01, wait_until_sec};
use futures::compat::Future01CompatExt;
use futures::future::join_all;
use keys::hash::H256;
@@ -570,17 +570,15 @@ impl FeeEstimator for Platform {
ConfirmationTarget::HighPriority => self.confirmations_targets.high_priority,
};
let fee_per_kb = tokio::task::block_in_place(move || {
- self.rpc_client()
- .estimate_fee_sat(
- platform_coin.decimals(),
- // Todo: when implementing Native client detect_fee_method should be used for Native and
- // EstimateFeeMethod::Standard for Electrum
- &EstimateFeeMethod::Standard,
- &conf.estimate_fee_mode,
- n_blocks,
- )
- .wait()
- .unwrap_or(latest_fees)
+ 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
+ // EstimateFeeMethod::Standard for Electrum
+ &EstimateFeeMethod::Standard,
+ &conf.estimate_fee_mode,
+ n_blocks,
+ ))
+ .unwrap_or(latest_fees)
});
// Set default fee to last known fee for the corresponding confirmation target
diff --git a/mm2src/coins/lp_coins.rs b/mm2src/coins/lp_coins.rs
index ac8426b73f..ef1f7d0f53 100644
--- a/mm2src/coins/lp_coins.rs
+++ b/mm2src/coins/lp_coins.rs
@@ -125,29 +125,6 @@ macro_rules! try_f {
};
}
-#[cfg(feature = "enable-solana")]
-macro_rules! try_tx_fus_err {
- ($err: expr) => {
- return Box::new(futures01::future::err(crate::TransactionErr::Plain(ERRL!(
- "{:?}", $err
- ))))
- };
-}
-
-#[cfg(feature = "enable-solana")]
-macro_rules! try_tx_fus_opt {
- ($e: expr, $err: expr) => {
- match $e {
- Some(ok) => ok,
- None => {
- return Box::new(futures01::future::err(crate::TransactionErr::Plain(ERRL!(
- "{:?}", $err
- ))))
- },
- }
- };
-}
-
/// `TransactionErr` compatible `try_fus` macro.
macro_rules! try_tx_fus {
($e: expr) => {
@@ -280,30 +257,6 @@ pub mod tx_history_storage;
#[cfg(feature = "enable-sia")] pub mod siacoin;
#[cfg(feature = "enable-sia")] use siacoin::SiaCoin;
-#[doc(hidden)]
-#[allow(unused_variables)]
-#[cfg(all(
- feature = "enable-solana",
- not(target_os = "ios"),
- not(target_os = "android"),
- not(target_arch = "wasm32")
-))]
-pub mod solana;
-#[cfg(all(
- feature = "enable-solana",
- not(target_os = "ios"),
- not(target_os = "android"),
- not(target_arch = "wasm32")
-))]
-pub use solana::spl::SplToken;
-#[cfg(all(
- feature = "enable-solana",
- not(target_os = "ios"),
- not(target_os = "android"),
- not(target_arch = "wasm32")
-))]
-pub use solana::{SolTransaction, SolanaActivationParams, SolanaCoin, SolanaFeeDetails};
-
pub mod utxo;
use utxo::bch::{bch_coin_with_policy, BchActivationRequest, BchCoin};
use utxo::qtum::{self, qtum_coin_with_policy, Qrc20AddressError, QtumCoin, QtumDelegationOps, QtumDelegationRequest,
@@ -631,8 +584,6 @@ pub trait Transaction: fmt::Debug + 'static {
pub enum TransactionEnum {
UtxoTx(UtxoTx),
SignedEthTx(SignedEthTx),
- #[cfg(all(feature = "enable-solana", not(target_arch = "wasm32")))]
- SolTransaction(SolTransaction),
ZTransaction(ZTransaction),
CosmosTransaction(CosmosTransaction),
#[cfg(not(target_arch = "wasm32"))]
@@ -641,8 +592,6 @@ pub enum TransactionEnum {
ifrom!(TransactionEnum, UtxoTx);
ifrom!(TransactionEnum, SignedEthTx);
-#[cfg(all(feature = "enable-solana", not(target_arch = "wasm32")))]
-ifrom!(TransactionEnum, SolTransaction);
ifrom!(TransactionEnum, ZTransaction);
#[cfg(not(target_arch = "wasm32"))]
ifrom!(TransactionEnum, LightningPayment);
@@ -666,8 +615,6 @@ impl Deref for TransactionEnum {
TransactionEnum::CosmosTransaction(ref t) => t,
#[cfg(not(target_arch = "wasm32"))]
TransactionEnum::LightningPayment(ref p) => p,
- #[cfg(all(feature = "enable-solana", not(target_arch = "wasm32")))]
- TransactionEnum::SolTransaction(ref s) => s,
}
}
}
@@ -2275,13 +2222,6 @@ pub enum TxFeeDetails {
Qrc20(Qrc20FeeDetails),
Slp(SlpFeeDetails),
Tendermint(TendermintFeeDetails),
- #[cfg(all(
- feature = "enable-solana",
- not(target_os = "ios"),
- not(target_os = "android"),
- not(target_arch = "wasm32")
- ))]
- Solana(SolanaFeeDetails),
}
/// Deserialize the TxFeeDetails as an untagged enum.
@@ -2296,13 +2236,6 @@ impl<'de> Deserialize<'de> for TxFeeDetails {
Utxo(UtxoFeeDetails),
Eth(EthTxFeeDetails),
Qrc20(Qrc20FeeDetails),
- #[cfg(all(
- feature = "enable-solana",
- not(target_os = "ios"),
- not(target_os = "android"),
- not(target_arch = "wasm32")
- ))]
- Solana(SolanaFeeDetails),
Tendermint(TendermintFeeDetails),
}
@@ -2310,13 +2243,6 @@ impl<'de> Deserialize<'de> for TxFeeDetails {
TxFeeDetailsUnTagged::Utxo(f) => Ok(TxFeeDetails::Utxo(f)),
TxFeeDetailsUnTagged::Eth(f) => Ok(TxFeeDetails::Eth(f)),
TxFeeDetailsUnTagged::Qrc20(f) => Ok(TxFeeDetails::Qrc20(f)),
- #[cfg(all(
- feature = "enable-solana",
- not(target_os = "ios"),
- not(target_os = "android"),
- not(target_arch = "wasm32")
- ))]
- TxFeeDetailsUnTagged::Solana(f) => Ok(TxFeeDetails::Solana(f)),
TxFeeDetailsUnTagged::Tendermint(f) => Ok(TxFeeDetails::Tendermint(f)),
}
}
@@ -2334,16 +2260,6 @@ impl From for TxFeeDetails {
fn from(qrc20_details: Qrc20FeeDetails) -> Self { TxFeeDetails::Qrc20(qrc20_details) }
}
-#[cfg(all(
- feature = "enable-solana",
- not(target_os = "ios"),
- not(target_os = "android"),
- not(target_arch = "wasm32")
-))]
-impl From for TxFeeDetails {
- fn from(solana_details: SolanaFeeDetails) -> Self { TxFeeDetails::Solana(solana_details) }
-}
-
impl From for TxFeeDetails {
fn from(tendermint_details: TendermintFeeDetails) -> Self { TxFeeDetails::Tendermint(tendermint_details) }
}
@@ -3548,20 +3464,6 @@ pub enum MmCoinEnum {
SlpToken(SlpToken),
Tendermint(TendermintCoin),
TendermintToken(TendermintToken),
- #[cfg(all(
- feature = "enable-solana",
- not(target_os = "ios"),
- not(target_os = "android"),
- not(target_arch = "wasm32")
- ))]
- SolanaCoin(SolanaCoin),
- #[cfg(all(
- feature = "enable-solana",
- not(target_os = "ios"),
- not(target_os = "android"),
- not(target_arch = "wasm32")
- ))]
- SplToken(SplToken),
#[cfg(not(target_arch = "wasm32"))]
LightningCoin(LightningCoin),
#[cfg(feature = "enable-sia")]
@@ -3581,26 +3483,6 @@ impl From for MmCoinEnum {
fn from(c: TestCoin) -> MmCoinEnum { MmCoinEnum::Test(c) }
}
-#[cfg(all(
- feature = "enable-solana",
- not(target_os = "ios"),
- not(target_os = "android"),
- not(target_arch = "wasm32")
-))]
-impl From for MmCoinEnum {
- fn from(c: SolanaCoin) -> MmCoinEnum { MmCoinEnum::SolanaCoin(c) }
-}
-
-#[cfg(all(
- feature = "enable-solana",
- not(target_os = "ios"),
- not(target_os = "android"),
- not(target_arch = "wasm32")
-))]
-impl From for MmCoinEnum {
- fn from(c: SplToken) -> MmCoinEnum { MmCoinEnum::SplToken(c) }
-}
-
impl From for MmCoinEnum {
fn from(coin: QtumCoin) -> Self { MmCoinEnum::QtumCoin(coin) }
}
@@ -3658,20 +3540,6 @@ impl Deref for MmCoinEnum {
#[cfg(feature = "enable-sia")]
MmCoinEnum::SiaCoin(ref c) => c,
MmCoinEnum::Test(ref c) => c,
- #[cfg(all(
- feature = "enable-solana",
- not(target_os = "ios"),
- not(target_os = "android"),
- not(target_arch = "wasm32")
- ))]
- MmCoinEnum::SolanaCoin(ref c) => c,
- #[cfg(all(
- feature = "enable-solana",
- not(target_os = "ios"),
- not(target_os = "android"),
- not(target_arch = "wasm32")
- ))]
- MmCoinEnum::SplToken(ref c) => c,
}
}
}
@@ -4381,14 +4249,6 @@ pub enum CoinProtocol {
network: BlockchainNetwork,
confirmation_targets: PlatformCoinConfirmationTargets,
},
- #[cfg(all(feature = "enable-solana", not(target_arch = "wasm32")))]
- SOLANA,
- #[cfg(all(feature = "enable-solana", not(target_arch = "wasm32")))]
- SPLTOKEN {
- platform: String,
- token_contract_address: String,
- decimals: u8,
- },
ZHTLC(ZcoinProtocolInfo),
#[cfg(feature = "enable-sia")]
SIA,
@@ -4650,14 +4510,6 @@ pub async fn lp_coininit(ctx: &MmArc, ticker: &str, req: &Json) -> Result return ERR!("NFT 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(all(feature = "enable-solana", not(target_arch = "wasm32")))]
- CoinProtocol::SOLANA => {
- return ERR!("Solana protocol is not supported by lp_coininit - use enable_solana_with_tokens instead")
- },
- #[cfg(all(feature = "enable-solana", not(target_arch = "wasm32")))]
- CoinProtocol::SPLTOKEN { .. } => {
- return ERR!("SplToken protocol is not supported by lp_coininit - use enable_spl instead")
- },
#[cfg(feature = "enable-sia")]
CoinProtocol::SIA { .. } => {
return ERR!("SIA protocol is not supported by lp_coininit. Use task::enable_sia::init");
@@ -5242,10 +5094,6 @@ pub fn address_by_coin_conf_and_pubkey_str(
CoinProtocol::LIGHTNING { .. } => {
ERR!("address_by_coin_conf_and_pubkey_str is not implemented for lightning protocol yet!")
},
- #[cfg(all(feature = "enable-solana", not(target_arch = "wasm32")))]
- CoinProtocol::SOLANA | CoinProtocol::SPLTOKEN { .. } => {
- ERR!("Solana pubkey is the public address - you do not need to use this rpc call.")
- },
CoinProtocol::ZHTLC { .. } => ERR!("address_by_coin_conf_and_pubkey_str is not supported for ZHTLC protocol!"),
#[cfg(feature = "enable-sia")]
CoinProtocol::SIA { .. } => ERR!("address_by_coin_conf_and_pubkey_str is not supported for SIA protocol!"), // TODO Alright
diff --git a/mm2src/coins/qrc20/qrc20_tests.rs b/mm2src/coins/qrc20/qrc20_tests.rs
index 2caf87c3bf..d77afa2f9b 100644
--- a/mm2src/coins/qrc20/qrc20_tests.rs
+++ b/mm2src/coins/qrc20/qrc20_tests.rs
@@ -1,6 +1,6 @@
use super::*;
use crate::{DexFee, TxFeeDetails, WaitForHTLCTxSpendArgs};
-use common::{block_on, wait_until_sec, DEX_FEE_ADDR_RAW_PUBKEY};
+use common::{block_on, block_on_f01, wait_until_sec, DEX_FEE_ADDR_RAW_PUBKEY};
use crypto::Secp256k1Secret;
use itertools::Itertools;
use keys::Address;
@@ -96,7 +96,7 @@ fn test_withdraw_to_p2sh_address_should_fail() {
memo: None,
ibc_source_channel: None,
};
- let err = coin.withdraw(req).wait().unwrap_err().into_inner();
+ let err = block_on_f01(coin.withdraw(req)).unwrap_err().into_inner();
let expect = WithdrawError::InvalidAddress("QRC20 can be sent to P2PKH addresses only".to_owned());
assert_eq!(err, expect);
}
@@ -112,19 +112,22 @@ fn test_withdraw_impl_fee_details() {
let (_ctx, coin) = qrc20_coin_for_test(priv_key, None);
Qrc20Coin::get_unspent_ordered_list.mock_safe(|coin, _| {
- let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
- let unspents = vec![UnspentInfo {
- outpoint: OutPoint {
- hash: 1.into(),
- index: 0,
- },
- value: 1000000000,
- height: Default::default(),
- script: coin
- .script_for_address(&block_on(coin.as_ref().derivation_method.unwrap_single_addr()))
- .unwrap(),
- }];
- MockResult::Return(Box::pin(futures::future::ok((unspents, cache))))
+ let fut = async move {
+ let cache = coin.as_ref().recently_spent_outpoints.lock().await;
+ let unspents = vec![UnspentInfo {
+ outpoint: OutPoint {
+ hash: 1.into(),
+ index: 0,
+ },
+ value: 1000000000,
+ height: Default::default(),
+ script: coin
+ .script_for_address(&coin.as_ref().derivation_method.unwrap_single_addr().await)
+ .unwrap(),
+ }];
+ Ok((unspents, cache))
+ };
+ MockResult::Return(fut.boxed())
});
let withdraw_req = WithdrawRequest {
@@ -140,7 +143,7 @@ fn test_withdraw_impl_fee_details() {
memo: None,
ibc_source_channel: None,
};
- let tx_details = coin.withdraw(withdraw_req).wait().unwrap();
+ let tx_details = block_on_f01(coin.withdraw(withdraw_req)).unwrap();
let expected: Qrc20FeeDetails = json::from_value(json!({
"coin": "QTUM",
@@ -287,7 +290,7 @@ fn test_wait_for_confirmations_excepted() {
wait_until,
check_every,
};
- coin.wait_for_confirmations(confirm_payment_input).wait().unwrap();
+ block_on_f01(coin.wait_for_confirmations(confirm_payment_input)).unwrap();
// tx_hash: ed53b97deb2ad76974c972cb084f6ba63bd9f16c91c4a39106a20c6d14599b2a
// `erc20Payment` contract call excepted
@@ -299,7 +302,7 @@ fn test_wait_for_confirmations_excepted() {
wait_until,
check_every,
};
- let error = coin.wait_for_confirmations(confirm_payment_input).wait().unwrap_err();
+ let error = block_on_f01(coin.wait_for_confirmations(confirm_payment_input)).unwrap_err();
log!("error: {:?}", error);
assert!(error.contains("Contract call failed with an error: Revert"));
@@ -313,7 +316,7 @@ fn test_wait_for_confirmations_excepted() {
wait_until,
check_every,
};
- let error = coin.wait_for_confirmations(confirm_payment_input).wait().unwrap_err();
+ let error = block_on_f01(coin.wait_for_confirmations(confirm_payment_input)).unwrap_err();
log!("error: {:?}", error);
assert!(error.contains("Contract call failed with an error: Revert"));
}
@@ -333,67 +336,59 @@ fn test_validate_fee() {
let amount = BigDecimal::from_str("0.01").unwrap();
- let result = coin
- .validate_fee(ValidateFeeArgs {
- fee_tx: &tx,
- expected_sender: &sender_pub,
- fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
- dex_fee: &DexFee::Standard(amount.clone().into()),
- min_block_number: 0,
- uuid: &[],
- })
- .wait();
+ let result = block_on_f01(coin.validate_fee(ValidateFeeArgs {
+ fee_tx: &tx,
+ expected_sender: &sender_pub,
+ fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
+ dex_fee: &DexFee::Standard(amount.clone().into()),
+ min_block_number: 0,
+ uuid: &[],
+ }));
assert!(result.is_ok());
let fee_addr_dif = hex::decode("03bc2c7ba671bae4a6fc835244c9762b41647b9827d4780a89a949b984a8ddcc05").unwrap();
- let err = coin
- .validate_fee(ValidateFeeArgs {
- fee_tx: &tx,
- expected_sender: &sender_pub,
- fee_addr: &fee_addr_dif,
- dex_fee: &DexFee::Standard(amount.clone().into()),
- min_block_number: 0,
- uuid: &[],
- })
- .wait()
- .expect_err("Expected an error")
- .into_inner();
+ let err = block_on_f01(coin.validate_fee(ValidateFeeArgs {
+ fee_tx: &tx,
+ expected_sender: &sender_pub,
+ fee_addr: &fee_addr_dif,
+ dex_fee: &DexFee::Standard(amount.clone().into()),
+ min_block_number: 0,
+ uuid: &[],
+ }))
+ .expect_err("Expected an error")
+ .into_inner();
log!("error: {:?}", err);
match err {
ValidatePaymentError::WrongPaymentTx(err) => assert!(err.contains("QRC20 Fee tx was sent to wrong address")),
_ => panic!("Expected `WrongPaymentTx` wrong receiver address, found {:?}", err),
}
- let err = coin
- .validate_fee(ValidateFeeArgs {
- fee_tx: &tx,
- expected_sender: &DEX_FEE_ADDR_RAW_PUBKEY,
- fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
- dex_fee: &DexFee::Standard(amount.clone().into()),
- min_block_number: 0,
- uuid: &[],
- })
- .wait()
- .expect_err("Expected an error")
- .into_inner();
+ let err = block_on_f01(coin.validate_fee(ValidateFeeArgs {
+ fee_tx: &tx,
+ expected_sender: &DEX_FEE_ADDR_RAW_PUBKEY,
+ fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
+ dex_fee: &DexFee::Standard(amount.clone().into()),
+ min_block_number: 0,
+ uuid: &[],
+ }))
+ .expect_err("Expected an error")
+ .into_inner();
log!("error: {:?}", err);
match err {
ValidatePaymentError::WrongPaymentTx(err) => assert!(err.contains("was sent from wrong address")),
_ => panic!("Expected `WrongPaymentTx` wrong sender address, found {:?}", err),
}
- let err = coin
- .validate_fee(ValidateFeeArgs {
- fee_tx: &tx,
- expected_sender: &sender_pub,
- fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
- dex_fee: &DexFee::Standard(amount.clone().into()),
- min_block_number: 2000000,
- uuid: &[],
- })
- .wait()
- .expect_err("Expected an error")
- .into_inner();
+ let err = block_on_f01(coin.validate_fee(ValidateFeeArgs {
+ fee_tx: &tx,
+ expected_sender: &sender_pub,
+ fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
+ dex_fee: &DexFee::Standard(amount.clone().into()),
+ min_block_number: 2000000,
+ uuid: &[],
+ }))
+ .expect_err("Expected an error")
+ .into_inner();
log!("error: {:?}", err);
match err {
ValidatePaymentError::WrongPaymentTx(err) => assert!(err.contains("confirmed before min_block")),
@@ -401,18 +396,16 @@ fn test_validate_fee() {
}
let amount_dif = BigDecimal::from_str("0.02").unwrap();
- let err = coin
- .validate_fee(ValidateFeeArgs {
- fee_tx: &tx,
- expected_sender: &sender_pub,
- fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
- dex_fee: &DexFee::Standard(amount_dif.into()),
- min_block_number: 0,
- uuid: &[],
- })
- .wait()
- .expect_err("Expected an error")
- .into_inner();
+ let err = block_on_f01(coin.validate_fee(ValidateFeeArgs {
+ fee_tx: &tx,
+ expected_sender: &sender_pub,
+ fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
+ dex_fee: &DexFee::Standard(amount_dif.into()),
+ min_block_number: 0,
+ uuid: &[],
+ }))
+ .expect_err("Expected an error")
+ .into_inner();
log!("error: {:?}", err);
match err {
ValidatePaymentError::WrongPaymentTx(err) => {
@@ -424,18 +417,16 @@ fn test_validate_fee() {
// QTUM tx "8a51f0ffd45f34974de50f07c5bf2f0949da4e88433f8f75191953a442cf9310"
let tx = TransactionEnum::UtxoTx("020000000113640281c9332caeddd02a8dd0d784809e1ad87bda3c972d89d5ae41f5494b85010000006a47304402207c5c904a93310b8672f4ecdbab356b65dd869a426e92f1064a567be7ccfc61ff02203e4173b9467127f7de4682513a21efb5980e66dbed4da91dff46534b8e77c7ef012102baefe72b3591de2070c0da3853226b00f082d72daa417688b61cb18c1d543d1afeffffff020001b2c4000000001976a9149e032d4b0090a11dc40fe6c47601499a35d55fbb88acbc4dd20c2f0000001976a9144208fa7be80dcf972f767194ad365950495064a488ac76e70800".into());
let sender_pub = hex::decode("02baefe72b3591de2070c0da3853226b00f082d72daa417688b61cb18c1d543d1a").unwrap();
- let err = coin
- .validate_fee(ValidateFeeArgs {
- fee_tx: &tx,
- expected_sender: &sender_pub,
- fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
- dex_fee: &DexFee::Standard(amount.into()),
- min_block_number: 0,
- uuid: &[],
- })
- .wait()
- .expect_err("Expected an error")
- .into_inner();
+ let err = block_on_f01(coin.validate_fee(ValidateFeeArgs {
+ fee_tx: &tx,
+ expected_sender: &sender_pub,
+ fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
+ dex_fee: &DexFee::Standard(amount.into()),
+ min_block_number: 0,
+ uuid: &[],
+ }))
+ .expect_err("Expected an error")
+ .into_inner();
log!("error: {:?}", err);
match err {
ValidatePaymentError::WrongPaymentTx(err) => assert!(err.contains("Expected 'transfer' contract call")),
@@ -462,18 +453,16 @@ fn test_wait_for_tx_spend_malicious() {
let payment_tx = hex::decode("01000000016601daa208531d20532c460d0c86b74a275f4a126bbffcf4eafdf33835af2859010000006a47304402205825657548bc1b5acf3f4bb2f89635a02b04f3228cd08126e63c5834888e7ac402207ca05fa0a629a31908a97a508e15076e925f8e621b155312b7526a6666b06a76012103693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9ffffffff020000000000000000e35403a0860101284cc49b415b2a8620ad3b72361a5aeba5dffd333fb64750089d935a1ec974d6a91ef4f24ff6ba0000000000000000000000000000000000000000000000000000000001312d00000000000000000000000000d362e096e873eb7907e205fadc6175c6fec7bc44000000000000000000000000783cf0be521101942da509846ea476e683aad8324b6b2e5444c2639cc0fb7bcea5afba3f3cdce239000000000000000000000000000000000000000000000000000000000000000000000000000000005f855c7614ba8b71f3544b93e2f681f996da519a98ace0107ac2203de400000000001976a9149e032d4b0090a11dc40fe6c47601499a35d55fbb88ac415d855f").unwrap();
let wait_until = now_sec() + 1;
let from_block = 696245;
- let found = coin
- .wait_for_htlc_tx_spend(WaitForHTLCTxSpendArgs {
- tx_bytes: &payment_tx,
- secret_hash: &[],
- wait_until,
- from_block,
- swap_contract_address: &coin.swap_contract_address(),
- check_every: TAKER_PAYMENT_SPEND_SEARCH_INTERVAL,
- watcher_reward: false,
- })
- .wait()
- .unwrap();
+ let found = block_on_f01(coin.wait_for_htlc_tx_spend(WaitForHTLCTxSpendArgs {
+ tx_bytes: &payment_tx,
+ secret_hash: &[],
+ wait_until,
+ from_block,
+ swap_contract_address: &coin.swap_contract_address(),
+ check_every: TAKER_PAYMENT_SPEND_SEARCH_INTERVAL,
+ watcher_reward: false,
+ }))
+ .unwrap();
let spend_tx = match found {
TransactionEnum::UtxoTx(tx) => tx,
@@ -731,7 +720,7 @@ fn test_get_trade_fee() {
// check if the coin's tx fee is expected
check_tx_fee(&coin, ActualTxFee::FixedPerKb(EXPECTED_TX_FEE as u64));
- let actual_trade_fee = coin.get_trade_fee().wait().unwrap();
+ let actual_trade_fee = block_on_f01(coin.get_trade_fee()).unwrap();
let expected_trade_fee_amount = big_decimal_from_sat(
2 * CONTRACT_CALL_GAS_FEE + SWAP_PAYMENT_GAS_FEE + EXPECTED_TX_FEE,
coin.utxo.decimals,
@@ -905,10 +894,8 @@ fn test_receiver_trade_preimage() {
// check if the coin's tx fee is expected
check_tx_fee(&coin, ActualTxFee::FixedPerKb(EXPECTED_TX_FEE as u64));
- let actual = coin
- .get_receiver_trade_fee(FeeApproxStage::WithoutApprox)
- .wait()
- .expect("!get_receiver_trade_fee");
+ let actual =
+ block_on_f01(coin.get_receiver_trade_fee(FeeApproxStage::WithoutApprox)).expect("!get_receiver_trade_fee");
// only one contract call should be included into the expected trade fee
let expected_receiver_fee = big_decimal_from_sat(CONTRACT_CALL_GAS_FEE + EXPECTED_TX_FEE, coin.utxo.decimals);
let expected = TradeFee {
@@ -935,7 +922,7 @@ fn test_taker_fee_tx_fee() {
spendable: BigDecimal::from(5u32),
unspendable: BigDecimal::from(0u32),
};
- assert_eq!(coin.my_balance().wait().expect("!my_balance"), expected_balance);
+ assert_eq!(block_on_f01(coin.my_balance()).expect("!my_balance"), expected_balance);
let dex_fee_amount = BigDecimal::from(5u32);
let actual = block_on(coin.get_fee_to_send_taker_fee(
diff --git a/mm2src/coins/solana.rs b/mm2src/coins/solana.rs
deleted file mode 100644
index 2b9abef1ca..0000000000
--- a/mm2src/coins/solana.rs
+++ /dev/null
@@ -1,1098 +0,0 @@
-use std::{collections::HashMap,
- convert::{TryFrom, TryInto},
- fmt::Debug,
- ops::Deref,
- str::FromStr,
- sync::{Arc, Mutex}};
-
-use async_trait::async_trait;
-use base58::ToBase58;
-use bincode::{deserialize, serialize};
-use bitcrypto::sha256;
-use common::{async_blocking,
- executor::{abortable_queue::AbortableQueue, AbortableSystem, AbortedError},
- log::error,
- now_sec};
-use crypto::HDPathToCoin;
-use derive_more::Display;
-use futures::{compat::Future01CompatExt,
- {FutureExt, TryFutureExt}};
-use futures01::Future;
-use keys::KeyPair;
-use mm2_core::mm_ctx::MmArc;
-use mm2_err_handle::prelude::*;
-use mm2_number::{BigDecimal, MmNumber};
-use num_traits::ToPrimitive;
-use rpc::v1::types::Bytes as BytesJson;
-pub use satomic_swap::{instruction::AtomicSwapInstruction, STORAGE_SPACE_ALLOCATED};
-use serde_json::{self as json, Value as Json};
-use solana_client::{client_error::{ClientError, ClientErrorKind},
- rpc_client::RpcClient,
- rpc_request::TokenAccountsFilter};
-pub use solana_sdk::transaction::Transaction as SolTransaction;
-use solana_sdk::{commitment_config::{CommitmentConfig, CommitmentLevel},
- instruction::{AccountMeta, Instruction},
- native_token::sol_to_lamports,
- program_error::ProgramError,
- pubkey::{ParsePubkeyError, Pubkey},
- signature::{Keypair as SolKeypair, Signer}};
-use spl_token::solana_program;
-
-use super::{CoinBalance, HistorySyncState, MarketCoinOps, MmCoin, SwapOps, TradeFee, Transaction, TransactionEnum,
- TransactionErr, WatcherOps};
-use crate::coin_errors::{MyAddressError, ValidatePaymentResult};
-use crate::hd_wallet::HDPathAccountToAddressId;
-use crate::solana::{solana_common::{lamports_to_sol, PrepareTransferData, SufficientBalanceError},
- spl::SplTokenInfo};
-use crate::{BalanceError, BalanceFut, CheckIfMyPaymentSentArgs, CoinFutSpawner, ConfirmPaymentInput, DexFee,
- FeeApproxStage, FoundSwapTxSpend, MakerSwapTakerCoin, MmCoinEnum, NegotiateSwapContractAddrErr,
- PaymentInstructionArgs, PaymentInstructions, PaymentInstructionsErr, PrivKeyBuildPolicy,
- PrivKeyPolicyNotAllowed, RawTransactionError, RawTransactionFut, RawTransactionRequest,
- RawTransactionResult, RefundError, RefundPaymentArgs, RefundResult, SearchForSwapTxSpendInput,
- SendMakerPaymentSpendPreimageInput, SendPaymentArgs, SignRawTransactionRequest, SignatureResult,
- SpendPaymentArgs, TakerSwapMakerCoin, TradePreimageFut, TradePreimageResult, TradePreimageValue,
- TransactionData, TransactionDetails, TransactionFut, TransactionResult, TransactionType, TxMarshalingErr,
- UnexpectedDerivationMethod, ValidateAddressResult, ValidateFeeArgs, ValidateInstructionsErr,
- ValidateOtherPubKeyErr, ValidatePaymentError, ValidatePaymentFut, ValidatePaymentInput,
- ValidateWatcherSpendInput, VerificationResult, WaitForHTLCTxSpendArgs, WatcherReward, WatcherRewardError,
- WatcherSearchForSwapTxSpendInput, WatcherValidatePaymentInput, WatcherValidateTakerFeeInput,
- WithdrawError, WithdrawFut, WithdrawRequest, WithdrawResult};
-
-pub mod solana_common;
-mod solana_decode_tx_helpers;
-pub mod spl;
-
-#[cfg(test)] mod solana_common_tests;
-#[cfg(test)] mod solana_tests;
-#[cfg(test)] mod spl_tests;
-
-pub const SOLANA_DEFAULT_DECIMALS: u64 = 9;
-pub const LAMPORTS_DUMMY_AMOUNT: u64 = 10;
-
-#[async_trait]
-pub trait SolanaCommonOps {
- fn rpc(&self) -> &RpcClient;
-
- fn is_token(&self) -> bool;
-
- async fn check_balance_and_prepare_transfer(
- &self,
- max: bool,
- amount: BigDecimal,
- fees: u64,
- ) -> Result>;
-}
-
-impl From for BalanceError {
- fn from(e: ClientError) -> Self {
- match e.kind {
- ClientErrorKind::Io(e) => BalanceError::Transport(e.to_string()),
- ClientErrorKind::Reqwest(e) => BalanceError::Transport(e.to_string()),
- ClientErrorKind::RpcError(e) => BalanceError::Transport(format!("{:?}", e)),
- ClientErrorKind::SerdeJson(e) => BalanceError::InvalidResponse(e.to_string()),
- ClientErrorKind::Custom(e) => BalanceError::Internal(e),
- ClientErrorKind::SigningError(_)
- | ClientErrorKind::TransactionError(_)
- | ClientErrorKind::FaucetError(_) => BalanceError::Internal("not_reacheable".to_string()),
- }
- }
-}
-
-impl From for BalanceError {
- fn from(e: ParsePubkeyError) -> Self { BalanceError::Internal(format!("{:?}", e)) }
-}
-
-impl From for WithdrawError {
- fn from(e: ClientError) -> Self {
- match e.kind {
- ClientErrorKind::Io(e) => WithdrawError::Transport(e.to_string()),
- ClientErrorKind::Reqwest(e) => WithdrawError::Transport(e.to_string()),
- ClientErrorKind::RpcError(e) => WithdrawError::Transport(format!("{:?}", e)),
- ClientErrorKind::SerdeJson(e) => WithdrawError::InternalError(e.to_string()),
- ClientErrorKind::Custom(e) => WithdrawError::InternalError(e),
- ClientErrorKind::SigningError(_)
- | ClientErrorKind::TransactionError(_)
- | ClientErrorKind::FaucetError(_) => WithdrawError::InternalError("not_reacheable".to_string()),
- }
- }
-}
-
-impl From for WithdrawError {
- fn from(e: ParsePubkeyError) -> Self { WithdrawError::InvalidAddress(format!("{:?}", e)) }
-}
-
-impl From for WithdrawError {
- fn from(e: ProgramError) -> Self { WithdrawError::InternalError(format!("{:?}", e)) }
-}
-
-#[derive(Debug)]
-pub enum AccountError {
- NotFundedError(String),
- ParsePubKeyError(String),
- ClientError(ClientErrorKind),
-}
-
-impl From for AccountError {
- fn from(e: ClientError) -> Self { AccountError::ClientError(e.kind) }
-}
-
-impl From for AccountError {
- fn from(e: ParsePubkeyError) -> Self { AccountError::ParsePubKeyError(format!("{:?}", e)) }
-}
-
-impl From for WithdrawError {
- fn from(e: AccountError) -> Self {
- match e {
- AccountError::NotFundedError(_) => WithdrawError::ZeroBalanceToWithdrawMax,
- AccountError::ParsePubKeyError(err) => WithdrawError::InternalError(err),
- AccountError::ClientError(e) => WithdrawError::Transport(format!("{:?}", e)),
- }
- }
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct SolanaActivationParams {
- confirmation_commitment: CommitmentLevel,
- client_url: String,
- #[serde(default)]
- path_to_address: HDPathAccountToAddressId,
-}
-
-#[derive(Debug, Display)]
-pub enum SolanaFromLegacyReqErr {
- InvalidCommitmentLevel(String),
- InvalidClientParsing(json::Error),
- ClientNoAvailableNodes(String),
-}
-
-#[derive(Debug, Display)]
-pub enum KeyPairCreationError {
- #[display(fmt = "Signature error: {}", _0)]
- SignatureError(ed25519_dalek::SignatureError),
- #[display(fmt = "KeyPairFromSeed error: {}", _0)]
- KeyPairFromSeed(String),
-}
-
-impl From for KeyPairCreationError {
- fn from(e: ed25519_dalek::SignatureError) -> Self { KeyPairCreationError::SignatureError(e) }
-}
-
-fn generate_keypair_from_slice(priv_key: &[u8]) -> Result> {
- let secret_key = ed25519_dalek::SecretKey::from_bytes(priv_key)?;
- let public_key = ed25519_dalek::PublicKey::from(&secret_key);
- let key_pair = ed25519_dalek::Keypair {
- secret: secret_key,
- public: public_key,
- };
- solana_sdk::signature::keypair_from_seed(key_pair.to_bytes().as_ref())
- .map_to_mm(|e| KeyPairCreationError::KeyPairFromSeed(e.to_string()))
-}
-
-pub async fn solana_coin_with_policy(
- ctx: &MmArc,
- ticker: &str,
- conf: &Json,
- params: SolanaActivationParams,
- priv_key_policy: PrivKeyBuildPolicy,
-) -> Result {
- let client = RpcClient::new_with_commitment(params.client_url.clone(), CommitmentConfig {
- commitment: params.confirmation_commitment,
- });
- let decimals = conf["decimals"].as_u64().unwrap_or(SOLANA_DEFAULT_DECIMALS) as u8;
-
- let priv_key = match priv_key_policy {
- PrivKeyBuildPolicy::IguanaPrivKey(priv_key) => priv_key,
- PrivKeyBuildPolicy::GlobalHDAccount(global_hd) => {
- let path_to_coin: HDPathToCoin = try_s!(json::from_value(conf["derivation_path"].clone()));
- let derivation_path = try_s!(params.path_to_address.to_derivation_path(&path_to_coin));
- try_s!(global_hd.derive_secp256k1_secret(&derivation_path))
- },
- PrivKeyBuildPolicy::Trezor => return ERR!("{}", PrivKeyPolicyNotAllowed::HardwareWalletNotSupported),
- };
-
- let key_pair = try_s!(generate_keypair_from_slice(priv_key.as_slice()));
- let my_address = key_pair.pubkey().to_string();
- let spl_tokens_infos = Arc::new(Mutex::new(HashMap::new()));
-
- // Create an abortable system linked to the `MmCtx` so if the context is stopped via `MmArc::stop`,
- // all spawned futures related to `SolanaCoin` will be aborted as well.
- let abortable_system: AbortableQueue = try_s!(ctx.abortable_system.create_subsystem());
-
- let solana_coin = SolanaCoin(Arc::new(SolanaCoinImpl {
- my_address,
- key_pair,
- ticker: ticker.to_string(),
- client,
- decimals,
- spl_tokens_infos,
- abortable_system,
- }));
- Ok(solana_coin)
-}
-
-/// pImpl idiom.
-pub struct SolanaCoinImpl {
- ticker: String,
- key_pair: SolKeypair,
- client: RpcClient,
- decimals: u8,
- my_address: String,
- spl_tokens_infos: Arc>>,
- /// This spawner is used to spawn coin's related futures that should be aborted on coin deactivation
- /// and on [`MmArc::stop`].
- pub abortable_system: AbortableQueue,
-}
-
-#[derive(Clone)]
-pub struct SolanaCoin(Arc);
-impl Deref for SolanaCoin {
- type Target = SolanaCoinImpl;
- fn deref(&self) -> &SolanaCoinImpl { &self.0 }
-}
-
-#[async_trait]
-impl SolanaCommonOps for SolanaCoin {
- fn rpc(&self) -> &RpcClient { &self.client }
-
- fn is_token(&self) -> bool { false }
-
- async fn check_balance_and_prepare_transfer(
- &self,
- max: bool,
- amount: BigDecimal,
- fees: u64,
- ) -> Result> {
- solana_common::check_balance_and_prepare_transfer(self, max, amount, fees).await
- }
-}
-
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
-pub struct SolanaFeeDetails {
- pub amount: BigDecimal,
-}
-
-async fn withdraw_base_coin_impl(coin: SolanaCoin, req: WithdrawRequest) -> WithdrawResult {
- let (hash, fees) = coin.estimate_withdraw_fees().await?;
- let res = coin
- .check_balance_and_prepare_transfer(req.max, req.amount.clone(), fees)
- .await?;
- let to = solana_sdk::pubkey::Pubkey::try_from(&*req.to)?;
- let tx = solana_sdk::system_transaction::transfer(&coin.key_pair, &to, res.lamports_to_send, hash);
- let serialized_tx = serialize(&tx).map_to_mm(|e| WithdrawError::InternalError(e.to_string()))?;
- let total_amount = lamports_to_sol(res.lamports_to_send);
- let received_by_me = if req.to == coin.my_address {
- total_amount.clone()
- } else {
- 0.into()
- };
- let spent_by_me = &total_amount + &res.sol_required;
- Ok(TransactionDetails {
- tx: TransactionData::new_signed(serialized_tx.into(), tx.signatures[0].to_string()),
- from: vec![coin.my_address.clone()],
- to: vec![req.to],
- total_amount: spent_by_me.clone(),
- my_balance_change: &received_by_me - &spent_by_me,
- spent_by_me,
- received_by_me,
- block_height: 0,
- timestamp: now_sec(),
- fee_details: Some(
- SolanaFeeDetails {
- amount: res.sol_required,
- }
- .into(),
- ),
- coin: coin.ticker.clone(),
- internal_id: vec![].into(),
- kmd_rewards: None,
- transaction_type: TransactionType::StandardTransfer,
- memo: None,
- })
-}
-
-async fn withdraw_impl(coin: SolanaCoin, req: WithdrawRequest) -> WithdrawResult {
- let validate_address_result = coin.validate_address(&req.to);
- if !validate_address_result.is_valid {
- return MmError::err(WithdrawError::InvalidAddress(
- validate_address_result.reason.unwrap_or_else(|| "Unknown".to_string()),
- ));
- }
- withdraw_base_coin_impl(coin, req).await
-}
-
-type SolTxFut = Box + Send + 'static>;
-
-impl Transaction for SolTransaction {
- fn tx_hex(&self) -> Vec {
- serialize(self).unwrap_or_else(|e| {
- error!("Error serializing SolTransaction: {}", e);
- vec![]
- })
- }
-
- fn tx_hash_as_bytes(&self) -> BytesJson {
- let hash = match self.signatures.get(0) {
- Some(signature) => signature,
- None => {
- error!("No signature found in SolTransaction");
- return BytesJson(Vec::new());
- },
- };
- BytesJson(Vec::from(hash.as_ref()))
- }
-}
-
-impl SolanaCoin {
- pub async fn estimate_withdraw_fees(&self) -> Result<(solana_sdk::hash::Hash, u64), MmError> {
- let hash = async_blocking({
- let coin = self.clone();
- move || coin.rpc().get_latest_blockhash()
- })
- .await?;
- let to = self.key_pair.pubkey();
-
- let tx = solana_sdk::system_transaction::transfer(&self.key_pair, &to, LAMPORTS_DUMMY_AMOUNT, hash);
- let fees = async_blocking({
- let coin = self.clone();
- move || coin.rpc().get_fee_for_message(tx.message())
- })
- .await?;
- Ok((hash, fees))
- }
-
- pub async fn my_balance_spl(&self, infos: SplTokenInfo) -> Result> {
- let token_accounts = async_blocking({
- let coin = self.clone();
- move || {
- coin.rpc().get_token_accounts_by_owner(
- &coin.key_pair.pubkey(),
- TokenAccountsFilter::Mint(infos.token_contract_address),
- )
- }
- })
- .await?;
- if token_accounts.is_empty() {
- return Ok(CoinBalance {
- spendable: Default::default(),
- unspendable: Default::default(),
- });
- }
- let actual_token_pubkey =
- Pubkey::from_str(&token_accounts[0].pubkey).map_err(|e| BalanceError::Internal(format!("{:?}", e)))?;
- let amount = async_blocking({
- let coin = self.clone();
- move || coin.rpc().get_token_account_balance(&actual_token_pubkey)
- })
- .await?;
- let balance =
- BigDecimal::from_str(&amount.ui_amount_string).map_to_mm(|e| BalanceError::Internal(e.to_string()))?;
- Ok(CoinBalance {
- spendable: balance,
- unspendable: Default::default(),
- })
- }
-
- fn my_balance_impl(&self) -> BalanceFut {
- let coin = self.clone();
- let fut = async_blocking(move || {
- // this is blocking IO
- let res = coin.rpc().get_balance(&coin.key_pair.pubkey())?;
- Ok(lamports_to_sol(res))
- });
- Box::new(fut.boxed().compat())
- }
-
- pub fn add_spl_token_info(&self, ticker: String, info: SplTokenInfo) {
- self.spl_tokens_infos.lock().unwrap().insert(ticker, info);
- }
-
- /// WARNING
- /// Be very careful using this function since it returns dereferenced clone
- /// of value behind the MutexGuard and makes it non-thread-safe.
- pub fn get_spl_tokens_infos(&self) -> HashMap {
- let guard = self.spl_tokens_infos.lock().unwrap();
- (*guard).clone()
- }
-
- fn send_hash_time_locked_payment(&self, args: SendPaymentArgs<'_>) -> SolTxFut {
- let receiver = Pubkey::new(args.other_pubkey);
- let swap_program_id = Pubkey::new(try_tx_fus_opt!(
- args.swap_contract_address,
- format!(
- "Unable to extract Bytes from args.swap_contract_address ( {:?} )",
- args.swap_contract_address
- )
- ));
- let amount = sol_to_lamports(try_tx_fus_opt!(
- args.amount.to_f64(),
- format!("Unable to extract value from args.amount ( {:?} )", args.amount)
- ));
- let secret_hash: [u8; 32] = try_tx_fus!(<[u8; 32]>::try_from(args.secret_hash));
- let (vault_pda, vault_pda_data, vault_bump_seed, vault_bump_seed_data, rent_exemption_lamports) =
- try_tx_fus!(self.create_vaults(args.time_lock, secret_hash, swap_program_id, STORAGE_SPACE_ALLOCATED));
- let swap_instruction = AtomicSwapInstruction::LamportsPayment {
- secret_hash,
- lock_time: args.time_lock,
- amount,
- receiver,
- rent_exemption_lamports,
- vault_bump_seed,
- vault_bump_seed_data,
- };
-
- let accounts = vec![
- AccountMeta::new(self.key_pair.pubkey(), true),
- AccountMeta::new(vault_pda_data, false),
- AccountMeta::new(vault_pda, false),
- AccountMeta::new(solana_program::system_program::id(), false),
- ];
- self.sign_and_send_swap_transaction_fut(swap_program_id, accounts, swap_instruction.pack())
- }
-
- fn spend_hash_time_locked_payment(&self, args: SpendPaymentArgs) -> SolTxFut {
- let sender = Pubkey::new(args.other_pubkey);
- let swap_program_id = Pubkey::new(try_tx_fus_opt!(
- args.swap_contract_address.as_ref(),
- format!(
- "Unable to extract Bytes from args.swap_contract_address ( {:?} )",
- args.swap_contract_address
- )
- ));
- let secret: [u8; 32] = try_tx_fus!(<[u8; 32]>::try_from(args.secret));
- let secret_hash = sha256(secret.as_slice()).take();
- let (lock_time, tx_secret_hash, amount, token_program) =
- try_tx_fus!(self.get_swap_transaction_details(args.other_payment_tx));
- if secret_hash != tx_secret_hash {
- try_tx_fus_err!(format!(
- "Provided secret_hash {:?} does not match transaction secret_hash {:?}",
- secret_hash, tx_secret_hash
- ));
- }
- let (vault_pda, vault_pda_data, vault_bump_seed, vault_bump_seed_data, _rent_exemption_lamports) =
- try_tx_fus!(self.create_vaults(lock_time, secret_hash, swap_program_id, STORAGE_SPACE_ALLOCATED));
- let swap_instruction = AtomicSwapInstruction::ReceiverSpend {
- secret,
- lock_time,
- amount,
- sender,
- token_program,
- vault_bump_seed,
- vault_bump_seed_data,
- };
- let accounts = vec![
- AccountMeta::new(self.key_pair.pubkey(), true),
- AccountMeta::new(vault_pda_data, false),
- AccountMeta::new(vault_pda, false),
- AccountMeta::new(solana_program::system_program::id(), false),
- ];
- self.sign_and_send_swap_transaction_fut(swap_program_id, accounts, swap_instruction.pack())
- }
-
- fn refund_hash_time_locked_payment(&self, args: RefundPaymentArgs) -> SolTxFut {
- let receiver = Pubkey::new(args.other_pubkey);
- let swap_program_id = Pubkey::new(try_tx_fus_opt!(
- args.swap_contract_address.as_ref(),
- format!(
- "Unable to extract Bytes from args.swap_contract_address ( {:?} )",
- args.swap_contract_address
- )
- ));
- let (lock_time, secret_hash, amount, token_program) =
- try_tx_fus!(self.get_swap_transaction_details(args.payment_tx));
- let (vault_pda, vault_pda_data, vault_bump_seed, vault_bump_seed_data, _rent_exemption_lamports) =
- try_tx_fus!(self.create_vaults(lock_time, secret_hash, swap_program_id, STORAGE_SPACE_ALLOCATED));
- let swap_instruction = AtomicSwapInstruction::SenderRefund {
- secret_hash,
- lock_time,
- amount,
- receiver,
- token_program,
- vault_bump_seed,
- vault_bump_seed_data,
- };
- let accounts = vec![
- AccountMeta::new(self.key_pair.pubkey(), true), // Marked as signer
- AccountMeta::new(vault_pda_data, false), // Not a signer
- AccountMeta::new(vault_pda, false), // Not a signer
- AccountMeta::new(solana_program::system_program::id(), false), //system_program must be included
- ];
- self.sign_and_send_swap_transaction_fut(swap_program_id, accounts, swap_instruction.pack())
- }
-
- fn get_swap_transaction_details(&self, tx_hex: &[u8]) -> Result<(u64, [u8; 32], u64, Pubkey), Box> {
- let transaction: SolTransaction = deserialize(tx_hex)
- .map_err(|e| Box::new(TransactionErr::Plain(ERRL!("error deserializing tx_hex: {:?}", e))))?;
-
- let instruction = transaction
- .message
- .instructions
- .get(0)
- .ok_or_else(|| Box::new(TransactionErr::Plain(ERRL!("Instruction not found in message"))))?;
-
- let instruction_data = &instruction.data[..];
- let instruction = AtomicSwapInstruction::unpack(instruction_data[0], instruction_data)
- .map_err(|e| Box::new(TransactionErr::Plain(ERRL!("error unpacking tx data: {:?}", e))))?;
-
- match instruction {
- AtomicSwapInstruction::LamportsPayment {
- secret_hash,
- lock_time,
- amount,
- ..
- } => Ok((lock_time, secret_hash, amount, Pubkey::new_from_array([0; 32]))),
- AtomicSwapInstruction::SPLTokenPayment {
- secret_hash,
- lock_time,
- amount,
- token_program,
- ..
- } => Ok((lock_time, secret_hash, amount, token_program)),
- AtomicSwapInstruction::ReceiverSpend {
- secret,
- lock_time,
- amount,
- token_program,
- ..
- } => Ok((lock_time, sha256(&secret).take(), amount, token_program)),
- AtomicSwapInstruction::SenderRefund {
- secret_hash,
- lock_time,
- amount,
- token_program,
- ..
- } => Ok((lock_time, secret_hash, amount, token_program)),
- }
- }
-
- fn sign_and_send_swap_transaction_fut(
- &self,
- program_id: Pubkey,
- accounts: Vec,
- data: Vec,
- ) -> SolTxFut {
- let coin = self.clone();
- Box::new(
- async move { coin.sign_and_send_swap_transaction(program_id, accounts, data).await }
- .boxed()
- .compat(),
- )
- }
-
- pub async fn sign_and_send_swap_transaction(
- &self,
- program_id: Pubkey,
- accounts: Vec,
- data: Vec,
- ) -> Result {
- // Construct the instruction to send to the program
- // The parameters here depend on your specific program's requirements
- let instruction = Instruction {
- program_id,
- accounts, // Specify account metas here
- data, // Pass data to the program here
- };
-
- // Create a transaction
- let recent_blockhash = self
- .client
- .get_latest_blockhash()
- .map_err(|e| TransactionErr::Plain(format!("Failed to get recent blockhash: {:?}", e)))?;
-
- let transaction: SolTransaction = SolTransaction::new_signed_with_payer(
- &[instruction],
- Some(&self.key_pair.pubkey()), //payer pubkey
- &[&self.key_pair], //payer
- recent_blockhash,
- );
-
- // Send the transaction
- let tx = self
- .client
- .send_and_confirm_transaction(&transaction)
- .map(|_signature| transaction)
- .map_err(|e| TransactionErr::Plain(ERRL!("Solana ClientError: {:?}", e)))?;
-
- Ok(tx)
- }
-
- fn create_vaults(
- &self,
- lock_time: u64,
- secret_hash: [u8; 32],
- program_id: Pubkey,
- space: u64,
- ) -> Result<(Pubkey, Pubkey, u8, u8, u64), Box> {
- let seeds: &[&[u8]] = &[b"swap", &lock_time.to_le_bytes()[..], &secret_hash[..]];
- let (vault_pda, bump_seed) = Pubkey::find_program_address(seeds, &program_id);
-
- let seeds_data: &[&[u8]] = &[b"swap_data", &lock_time.to_le_bytes()[..], &secret_hash[..]];
- let (vault_pda_data, bump_seed_data) = Pubkey::find_program_address(seeds_data, &program_id);
-
- let rent_exemption_lamports = self
- .client
- .get_minimum_balance_for_rent_exemption(
- space
- .try_into()
- .map_err(|e| Box::new(TransactionErr::Plain(ERRL!("unable to convert space: {:?}", e))))?,
- )
- .map_err(|e| {
- Box::new(TransactionErr::Plain(ERRL!(
- "error get_minimum_balance_for_rent_exemption: {:?}",
- e
- )))
- })?;
-
- Ok((
- vault_pda,
- vault_pda_data,
- bump_seed,
- bump_seed_data,
- rent_exemption_lamports,
- ))
- }
-}
-
-#[async_trait]
-impl MarketCoinOps for SolanaCoin {
- fn ticker(&self) -> &str { &self.ticker }
-
- fn my_address(&self) -> MmResult { Ok(self.my_address.clone()) }
-
- async fn get_public_key(&self) -> Result> {
- Ok(self.key_pair.pubkey().to_string())
- }
-
- fn sign_message_hash(&self, _message: &str) -> Option<[u8; 32]> { unimplemented!() }
-
- fn sign_message(&self, message: &str) -> SignatureResult { solana_common::sign_message(self, message) }
-
- fn verify_message(&self, signature: &str, message: &str, pubkey_bs58: &str) -> VerificationResult {
- solana_common::verify_message(self, signature, message, pubkey_bs58)
- }
-
- fn my_balance(&self) -> BalanceFut {
- let decimals = self.decimals as u64;
- let fut = self.my_balance_impl().and_then(move |result| {
- Ok(CoinBalance {
- spendable: result.with_prec(decimals),
- unspendable: 0.into(),
- })
- });
- Box::new(fut)
- }
-
- fn base_coin_balance(&self) -> BalanceFut {
- let decimals = self.decimals as u64;
- let fut = self
- .my_balance_impl()
- .and_then(move |result| Ok(result.with_prec(decimals)));
- Box::new(fut)
- }
-
- fn platform_ticker(&self) -> &str { self.ticker() }
-
- fn send_raw_tx(&self, tx: &str) -> Box + Send> {
- let coin = self.clone();
- let tx = tx.to_owned();
- let fut = async_blocking(move || {
- let bytes = hex::decode(tx).map_to_mm(|e| e).map_err(|e| format!("{:?}", e))?;
- let tx: SolTransaction = deserialize(bytes.as_slice())
- .map_to_mm(|e| e)
- .map_err(|e| format!("{:?}", e))?;
- // this is blocking IO
- let signature = coin.rpc().send_transaction(&tx).map_err(|e| format!("{:?}", e))?;
- Ok(signature.to_string())
- });
- Box::new(fut.boxed().compat())
- }
-
- fn send_raw_tx_bytes(&self, tx: &[u8]) -> Box + Send> {
- let coin = self.clone();
- let tx = tx.to_owned();
- let fut = async_blocking(move || {
- let tx = try_s!(deserialize(tx.as_slice()));
- // this is blocking IO
- let signature = coin.rpc().send_transaction(&tx).map_err(|e| format!("{:?}", e))?;
- Ok(signature.to_string())
- });
- Box::new(fut.boxed().compat())
- }
-
- #[inline(always)]
- async fn sign_raw_tx(&self, _args: &SignRawTransactionRequest) -> RawTransactionResult {
- MmError::err(RawTransactionError::NotImplemented {
- coin: self.ticker().to_string(),
- })
- }
-
- fn wait_for_confirmations(&self, _input: ConfirmPaymentInput) -> Box + Send> {
- unimplemented!()
- }
-
- fn wait_for_htlc_tx_spend(&self, args: WaitForHTLCTxSpendArgs<'_>) -> TransactionFut { unimplemented!() }
-
- fn tx_enum_from_bytes(&self, _bytes: &[u8]) -> Result> {
- MmError::err(TxMarshalingErr::NotSupported(
- "tx_enum_from_bytes is not supported for Solana yet.".to_string(),
- ))
- }
-
- fn current_block(&self) -> Box + Send> {
- let coin = self.clone();
- let fut = async_blocking(move || coin.rpc().get_block_height().map_err(|e| format!("{:?}", e)));
- Box::new(fut.boxed().compat())
- }
-
- fn display_priv_key(&self) -> Result { Ok(self.key_pair.secret().to_bytes()[..].to_base58()) }
-
- fn min_tx_amount(&self) -> BigDecimal { BigDecimal::from(0) }
-
- fn min_trading_vol(&self) -> MmNumber { MmNumber::from("0.00777") }
-
- fn is_trezor(&self) -> bool { unimplemented!() }
-}
-
-#[async_trait]
-impl SwapOps for SolanaCoin {
- fn send_taker_fee(&self, _fee_addr: &[u8], dex_fee: DexFee, _uuid: &[u8], _expire_at: u64) -> TransactionFut {
- unimplemented!()
- }
-
- fn send_maker_payment(&self, maker_payment: SendPaymentArgs) -> TransactionFut {
- Box::new(
- self.send_hash_time_locked_payment(maker_payment)
- .map(TransactionEnum::from),
- )
- }
-
- fn send_taker_payment(&self, taker_payment: SendPaymentArgs) -> TransactionFut {
- Box::new(
- self.send_hash_time_locked_payment(taker_payment)
- .map(TransactionEnum::from),
- )
- }
-
- async fn send_maker_spends_taker_payment(
- &self,
- maker_spends_payment_args: SpendPaymentArgs<'_>,
- ) -> TransactionResult {
- self.spend_hash_time_locked_payment(maker_spends_payment_args)
- .compat()
- .await
- .map(TransactionEnum::from)
- }
-
- async fn send_taker_spends_maker_payment(
- &self,
- taker_spends_payment_args: SpendPaymentArgs<'_>,
- ) -> TransactionResult {
- self.spend_hash_time_locked_payment(taker_spends_payment_args)
- .compat()
- .await
- .map(TransactionEnum::from)
- }
-
- async fn send_taker_refunds_payment(&self, taker_refunds_payment_args: RefundPaymentArgs<'_>) -> TransactionResult {
- self.refund_hash_time_locked_payment(taker_refunds_payment_args)
- .map(TransactionEnum::from)
- .compat()
- .await
- }
-
- async fn send_maker_refunds_payment(&self, maker_refunds_payment_args: RefundPaymentArgs<'_>) -> TransactionResult {
- self.refund_hash_time_locked_payment(maker_refunds_payment_args)
- .map(TransactionEnum::from)
- .compat()
- .await
- }
-
- fn validate_fee(&self, _validate_fee_args: ValidateFeeArgs) -> ValidatePaymentFut<()> { unimplemented!() }
-
- async fn validate_maker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentResult<()> {
- unimplemented!()
- }
-
- async fn validate_taker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentResult<()> {
- unimplemented!()
- }
-
- fn check_if_my_payment_sent(
- &self,
- _if_my_payment_sent_args: CheckIfMyPaymentSentArgs,
- ) -> Box, Error = String> + Send> {
- unimplemented!()
- }
-
- async fn search_for_swap_tx_spend_my(
- &self,
- _: SearchForSwapTxSpendInput<'_>,
- ) -> Result, String> {
- unimplemented!()
- }
-
- async fn search_for_swap_tx_spend_other(
- &self,
- _: SearchForSwapTxSpendInput<'_>,
- ) -> Result, String> {
- unimplemented!()
- }
-
- fn check_tx_signed_by_pub(&self, tx: &[u8], expected_pub: &[u8]) -> Result> {
- unimplemented!();
- }
-
- async fn extract_secret(
- &self,
- secret_hash: &[u8],
- spend_tx: &[u8],
- watcher_reward: bool,
- ) -> Result, String> {
- unimplemented!()
- }
-
- fn is_auto_refundable(&self) -> bool { false }
-
- async fn wait_for_htlc_refund(&self, _tx: &[u8], _locktime: u64) -> RefundResult<()> {
- MmError::err(RefundError::Internal(
- "wait_for_htlc_refund is not supported for this coin!".into(),
- ))
- }
-
- fn negotiate_swap_contract_addr(
- &self,
- _other_side_address: Option<&[u8]>,
- ) -> Result, MmError> {
- unimplemented!()
- }
-
- #[inline]
- fn derive_htlc_key_pair(&self, _swap_unique_data: &[u8]) -> KeyPair { todo!() }
-
- #[inline]
- fn derive_htlc_pubkey(&self, swap_unique_data: &[u8]) -> Vec {
- self.derive_htlc_key_pair(swap_unique_data).public_slice().to_vec()
- }
-
- fn validate_other_pubkey(&self, _raw_pubkey: &[u8]) -> MmResult<(), ValidateOtherPubKeyErr> { unimplemented!() }
-
- async fn maker_payment_instructions(
- &self,
- _args: PaymentInstructionArgs<'_>,
- ) -> Result>, MmError> {
- unimplemented!()
- }
-
- async fn taker_payment_instructions(
- &self,
- _args: PaymentInstructionArgs<'_>,
- ) -> Result>, MmError> {
- unimplemented!()
- }
-
- fn validate_maker_payment_instructions(
- &self,
- _instructions: &[u8],
- _args: PaymentInstructionArgs<'_>,
- ) -> Result> {
- unimplemented!()
- }
-
- fn validate_taker_payment_instructions(
- &self,
- _instructions: &[u8],
- _args: PaymentInstructionArgs<'_>,
- ) -> Result> {
- unimplemented!()
- }
-}
-
-#[async_trait]
-impl TakerSwapMakerCoin for SolanaCoin {
- async fn on_taker_payment_refund_start(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
-
- async fn on_taker_payment_refund_success(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
-}
-
-#[async_trait]
-impl MakerSwapTakerCoin for SolanaCoin {
- async fn on_maker_payment_refund_start(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
-
- async fn on_maker_payment_refund_success(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
-}
-
-#[async_trait]
-impl WatcherOps for SolanaCoin {
- fn create_maker_payment_spend_preimage(
- &self,
- _maker_payment_tx: &[u8],
- _time_lock: u64,
- _maker_pub: &[u8],
- _secret_hash: &[u8],
- _swap_unique_data: &[u8],
- ) -> TransactionFut {
- unimplemented!();
- }
-
- fn send_maker_payment_spend_preimage(&self, _input: SendMakerPaymentSpendPreimageInput) -> TransactionFut {
- unimplemented!();
- }
-
- fn create_taker_payment_refund_preimage(
- &self,
- _taker_payment_tx: &[u8],
- _time_lock: u64,
- _maker_pub: &[u8],
- _secret_hash: &[u8],
- _swap_contract_address: &Option,
- _swap_unique_data: &[u8],
- ) -> TransactionFut {
- unimplemented!();
- }
-
- fn send_taker_payment_refund_preimage(&self, _watcher_refunds_payment_args: RefundPaymentArgs) -> TransactionFut {
- unimplemented!();
- }
-
- fn watcher_validate_taker_fee(&self, input: WatcherValidateTakerFeeInput) -> ValidatePaymentFut<()> {
- unimplemented!();
- }
-
- fn watcher_validate_taker_payment(&self, _input: WatcherValidatePaymentInput) -> ValidatePaymentFut<()> {
- unimplemented!();
- }
-
- fn taker_validates_payment_spend_or_refund(&self, _input: ValidateWatcherSpendInput) -> ValidatePaymentFut<()> {
- unimplemented!()
- }
-
- async fn watcher_search_for_swap_tx_spend(
- &self,
- input: WatcherSearchForSwapTxSpendInput<'_>,
- ) -> Result, String> {
- unimplemented!();
- }
-
- async fn get_taker_watcher_reward(
- &self,
- other_coin: &MmCoinEnum,
- coin_amount: Option,
- other_coin_amount: Option,
- reward_amount: Option,
- wait_until: u64,
- ) -> Result> {
- unimplemented!();
- }
-
- async fn get_maker_watcher_reward(
- &self,
- other_coin: &MmCoinEnum,
- reward_amount: Option,
- wait_until: u64,
- ) -> Result, MmError> {
- unimplemented!();
- }
-}
-
-#[async_trait]
-impl MmCoin for SolanaCoin {
- fn is_asset_chain(&self) -> bool { false }
-
- fn spawner(&self) -> CoinFutSpawner { CoinFutSpawner::new(&self.abortable_system) }
-
- fn withdraw(&self, req: WithdrawRequest) -> WithdrawFut {
- Box::new(Box::pin(withdraw_impl(self.clone(), req)).compat())
- }
-
- fn get_raw_transaction(&self, _req: RawTransactionRequest) -> RawTransactionFut { unimplemented!() }
-
- fn get_tx_hex_by_hash(&self, tx_hash: Vec) -> RawTransactionFut { unimplemented!() }
-
- fn decimals(&self) -> u8 { self.decimals }
-
- fn convert_to_address(&self, _from: &str, _to_address_format: Json) -> Result { unimplemented!() }
-
- fn validate_address(&self, address: &str) -> ValidateAddressResult {
- if address.len() != 44 {
- return ValidateAddressResult {
- is_valid: false,
- reason: Some("Invalid address length".to_string()),
- };
- }
- let result = Pubkey::try_from(address);
- match result {
- Ok(pubkey) => {
- if pubkey.is_on_curve() {
- ValidateAddressResult {
- is_valid: true,
- reason: None,
- }
- } else {
- ValidateAddressResult {
- is_valid: false,
- reason: Some("not_on_curve".to_string()),
- }
- }
- },
- Err(err) => ValidateAddressResult {
- is_valid: false,
- reason: Some(format!("{:?}", err)),
- },
- }
- }
-
- fn process_history_loop(&self, _ctx: MmArc) -> Box + Send> { unimplemented!() }
-
- fn history_sync_status(&self) -> HistorySyncState { unimplemented!() }
-
- /// Get fee to be paid per 1 swap transaction
- fn get_trade_fee(&self) -> Box + Send> { unimplemented!() }
-
- async fn get_sender_trade_fee(
- &self,
- _value: TradePreimageValue,
- _stage: FeeApproxStage,
- _include_refund_fee: bool,
- ) -> TradePreimageResult {
- unimplemented!()
- }
-
- fn get_receiver_trade_fee(&self, _stage: FeeApproxStage) -> TradePreimageFut { unimplemented!() }
-
- async fn get_fee_to_send_taker_fee(
- &self,
- _dex_fee_amount: DexFee,
- _stage: FeeApproxStage,
- ) -> TradePreimageResult {
- unimplemented!()
- }
-
- fn required_confirmations(&self) -> u64 { 1 }
-
- fn requires_notarization(&self) -> bool { false }
-
- fn set_required_confirmations(&self, _confirmations: u64) { unimplemented!() }
-
- fn set_requires_notarization(&self, _requires_nota: bool) { unimplemented!() }
-
- fn swap_contract_address(&self) -> Option { unimplemented!() }
-
- fn fallback_swap_contract(&self) -> Option { unimplemented!() }
-
- fn mature_confirmations(&self) -> Option { None }
-
- fn coin_protocol_info(&self, _amount_to_receive: Option) -> Vec { Vec::new() }
-
- fn is_coin_protocol_supported(
- &self,
- _info: &Option>,
- _amount_to_send: Option,
- _locktime: u64,
- _is_maker: bool,
- ) -> bool {
- true
- }
-
- fn on_disabled(&self) -> Result<(), AbortedError> { AbortableSystem::abort_all(&self.abortable_system) }
-
- fn on_token_deactivated(&self, _ticker: &str) { unimplemented!() }
-}
diff --git a/mm2src/coins/solana/solana_common.rs b/mm2src/coins/solana/solana_common.rs
deleted file mode 100644
index 3f74c1caff..0000000000
--- a/mm2src/coins/solana/solana_common.rs
+++ /dev/null
@@ -1,181 +0,0 @@
-use crate::solana::SolanaCommonOps;
-use crate::{BalanceError, MarketCoinOps, NumConversError, SignatureError, SignatureResult, SolanaCoin,
- UnexpectedDerivationMethod, VerificationError, VerificationResult, WithdrawError};
-use base58::FromBase58;
-use derive_more::Display;
-use futures::compat::Future01CompatExt;
-use mm2_err_handle::prelude::*;
-use mm2_number::bigdecimal::{BigDecimal, ToPrimitive};
-use solana_sdk::native_token::LAMPORTS_PER_SOL;
-use solana_sdk::signature::{Signature, Signer};
-use std::str::FromStr;
-
-#[derive(Debug, Display)]
-pub enum SufficientBalanceError {
- #[display(
- fmt = "Not enough {} to withdraw: available {}, required at least {}",
- coin,
- available,
- required
- )]
- NotSufficientBalance {
- coin: String,
- available: BigDecimal,
- required: BigDecimal,
- },
- #[display(fmt = "The amount {} is too small, required at least {}", amount, threshold)]
- AmountTooLow { amount: BigDecimal, threshold: BigDecimal },
- #[display(fmt = "{}", _0)]
- UnexpectedDerivationMethod(UnexpectedDerivationMethod),
- #[display(fmt = "Wallet storage error: {}", _0)]
- WalletStorageError(String),
- #[display(fmt = "Invalid response: {}", _0)]
- InvalidResponse(String),
- #[display(fmt = "Transport: {}", _0)]
- Transport(String),
- #[display(fmt = "Internal: {}", _0)]
- Internal(String),
-}
-
-impl From for SufficientBalanceError {
- fn from(e: NumConversError) -> Self { SufficientBalanceError::Internal(e.to_string()) }
-}
-
-impl From for SufficientBalanceError {
- fn from(e: BalanceError) -> Self {
- match e {
- BalanceError::Transport(e) => SufficientBalanceError::Transport(e),
- BalanceError::InvalidResponse(e) => SufficientBalanceError::InvalidResponse(e),
- BalanceError::UnexpectedDerivationMethod(e) => SufficientBalanceError::UnexpectedDerivationMethod(e),
- BalanceError::Internal(e) => SufficientBalanceError::Internal(e),
- BalanceError::WalletStorageError(e) => SufficientBalanceError::WalletStorageError(e),
- }
- }
-}
-impl From for WithdrawError {
- fn from(e: SufficientBalanceError) -> Self {
- match e {
- SufficientBalanceError::NotSufficientBalance {
- coin,
- available,
- required,
- } => WithdrawError::NotSufficientBalance {
- coin,
- available,
- required,
- },
- SufficientBalanceError::UnexpectedDerivationMethod(e) => WithdrawError::from(e),
- SufficientBalanceError::InvalidResponse(e) | SufficientBalanceError::Transport(e) => {
- WithdrawError::Transport(e)
- },
- SufficientBalanceError::Internal(e) | SufficientBalanceError::WalletStorageError(e) => {
- WithdrawError::InternalError(e)
- },
- SufficientBalanceError::AmountTooLow { amount, threshold } => {
- WithdrawError::AmountTooLow { amount, threshold }
- },
- }
- }
-}
-
-pub struct PrepareTransferData {
- pub to_send: BigDecimal,
- pub my_balance: BigDecimal,
- pub sol_required: BigDecimal,
- pub lamports_to_send: u64,
-}
-
-pub fn lamports_to_sol(lamports: u64) -> BigDecimal { BigDecimal::from(lamports) / BigDecimal::from(LAMPORTS_PER_SOL) }
-
-pub fn sol_to_lamports(sol: &BigDecimal) -> Result> {
- let maybe_lamports = (sol * BigDecimal::from(LAMPORTS_PER_SOL)).to_u64();
- match maybe_lamports {
- None => MmError::err(NumConversError("Error when converting sol to lamports".to_string())),
- Some(lamports) => Ok(lamports),
- }
-}
-
-pub fn ui_amount_to_amount(ui_amount: BigDecimal, decimals: u8) -> Result> {
- let maybe_amount = (ui_amount * BigDecimal::from(10_u64.pow(decimals as u32))).to_u64();
- match maybe_amount {
- None => MmError::err(NumConversError("Error when converting ui amount to amount".to_string())),
- Some(amount) => Ok(amount),
- }
-}
-
-pub fn amount_to_ui_amount(amount: u64, decimals: u8) -> BigDecimal {
- BigDecimal::from(amount) / BigDecimal::from(10_u64.pow(decimals as u32))
-}
-
-pub fn sign_message(coin: &SolanaCoin, message: &str) -> SignatureResult {
- let signature = coin
- .key_pair
- .try_sign_message(message.as_bytes())
- .map_err(|e| SignatureError::InternalError(e.to_string()))?;
- Ok(signature.to_string())
-}
-
-pub fn verify_message(
- coin: &SolanaCoin,
- signature: &str,
- message: &str,
- pubkey_bs58: &str,
-) -> VerificationResult {
- let pubkey = pubkey_bs58.from_base58()?;
- let signature =
- Signature::from_str(signature).map_err(|e| VerificationError::SignatureDecodingError(e.to_string()))?;
- let is_valid = signature.verify(&pubkey, message.as_bytes());
- Ok(is_valid)
-}
-
-pub async fn check_balance_and_prepare_transfer(
- coin: &T,
- max: bool,
- amount: BigDecimal,
- fees: u64,
-) -> Result>
-where
- T: SolanaCommonOps + MarketCoinOps,
-{
- let base_balance = coin.base_coin_balance().compat().await?;
- let sol_required = lamports_to_sol(fees);
- if base_balance < sol_required {
- return MmError::err(SufficientBalanceError::NotSufficientBalance {
- coin: coin.platform_ticker().to_string(),
- available: base_balance.clone(),
- required: sol_required.clone(),
- });
- }
-
- let my_balance = coin.my_balance().compat().await?.spendable;
- let to_send = if max { my_balance.clone() } else { amount.clone() };
- let to_check = if max || coin.is_token() {
- to_send.clone()
- } else {
- &to_send + &sol_required
- };
- if to_check > my_balance {
- return MmError::err(SufficientBalanceError::NotSufficientBalance {
- coin: coin.ticker().to_string(),
- available: my_balance,
- required: to_check,
- });
- }
-
- let lamports_to_send = if !coin.is_token() {
- if max {
- sol_to_lamports(&my_balance)? - sol_to_lamports(&sol_required)?
- } else {
- sol_to_lamports(&amount)?
- }
- } else {
- 0_u64
- };
-
- Ok(PrepareTransferData {
- to_send,
- my_balance,
- sol_required,
- lamports_to_send,
- })
-}
diff --git a/mm2src/coins/solana/solana_common_tests.rs b/mm2src/coins/solana/solana_common_tests.rs
deleted file mode 100644
index 6bb5b833d1..0000000000
--- a/mm2src/coins/solana/solana_common_tests.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-use super::*;
-use crate::solana::spl::{SplToken, SplTokenFields};
-use crypto::privkey::{bip39_seed_from_passphrase, key_pair_from_seed};
-use ed25519_dalek_bip32::{DerivationPath, ExtendedSecretKey};
-use mm2_core::mm_ctx::MmCtxBuilder;
-use solana_client::rpc_client::RpcClient;
-use solana_sdk::commitment_config::{CommitmentConfig, CommitmentLevel};
-use std::str::FromStr;
-
-pub enum SolanaNet {
- //Mainnet,
- Testnet,
- Devnet,
-}
-
-pub fn solana_net_to_url(net_type: SolanaNet) -> String {
- match net_type {
- //SolanaNet::Mainnet => "https://api.mainnet-beta.solana.com".to_string(),
- SolanaNet::Testnet => "https://api.testnet.solana.com/".to_string(),
- SolanaNet::Devnet => "https://api.devnet.solana.com".to_string(),
- }
-}
-
-pub fn generate_key_pair_from_seed(seed: &str) -> SolKeypair {
- let derivation_path = DerivationPath::from_str("m/44'/501'/0'").unwrap();
- let seed = bip39_seed_from_passphrase(seed).unwrap();
-
- let ext = ExtendedSecretKey::from_seed(&seed.0)
- .unwrap()
- .derive(&derivation_path)
- .unwrap();
- let pub_key = ext.public_key();
- let pair = ed25519_dalek::Keypair {
- secret: ext.secret_key,
- public: pub_key,
- };
-
- solana_sdk::signature::keypair_from_seed(pair.to_bytes().as_ref()).unwrap()
-}
-
-pub fn generate_key_pair_from_iguana_seed(seed: String) -> SolKeypair {
- let key_pair = key_pair_from_seed(seed.as_str()).unwrap();
- let secret_key = ed25519_dalek::SecretKey::from_bytes(key_pair.private().secret.as_slice()).unwrap();
- let public_key = ed25519_dalek::PublicKey::from(&secret_key);
- let other_key_pair = ed25519_dalek::Keypair {
- secret: secret_key,
- public: public_key,
- };
- solana_sdk::signature::keypair_from_seed(other_key_pair.to_bytes().as_ref()).unwrap()
-}
-
-pub fn spl_coin_for_test(
- solana_coin: SolanaCoin,
- ticker: String,
- decimals: u8,
- token_contract_address: Pubkey,
-) -> SplToken {
- SplToken {
- conf: Arc::new(SplTokenFields {
- decimals,
- ticker,
- token_contract_address,
- abortable_system: AbortableQueue::default(),
- }),
- platform_coin: solana_coin,
- }
-}
-
-pub fn solana_coin_for_test(seed: String, net_type: SolanaNet) -> (MmArc, SolanaCoin) {
- let url = solana_net_to_url(net_type);
- let client = RpcClient::new_with_commitment(url, CommitmentConfig {
- commitment: CommitmentLevel::Finalized,
- });
- let conf = json!({
- "coins":[
- {"coin":"SOL","name":"solana","protocol":{"type":"SOL"},"rpcport":80,"mm2":1}
- ]
- });
- let ctx = MmCtxBuilder::new().with_conf(conf).into_mm_arc();
- let (ticker, decimals) = ("SOL".to_string(), 8);
- let key_pair = generate_key_pair_from_iguana_seed(seed);
- let my_address = key_pair.pubkey().to_string();
- let spl_tokens_infos = Arc::new(Mutex::new(HashMap::new()));
- let spawner = AbortableQueue::default();
-
- let solana_coin = SolanaCoin(Arc::new(SolanaCoinImpl {
- decimals,
- my_address,
- key_pair,
- ticker,
- client,
- spl_tokens_infos,
- abortable_system: spawner,
- }));
- (ctx, solana_coin)
-}
diff --git a/mm2src/coins/solana/solana_decode_tx_helpers.rs b/mm2src/coins/solana/solana_decode_tx_helpers.rs
deleted file mode 100644
index bd22fc044e..0000000000
--- a/mm2src/coins/solana/solana_decode_tx_helpers.rs
+++ /dev/null
@@ -1,222 +0,0 @@
-extern crate serde_derive;
-
-use crate::{NumConversResult, SolanaCoin, SolanaFeeDetails, TransactionData, TransactionDetails, TransactionType};
-use mm2_number::BigDecimal;
-use solana_sdk::native_token::lamports_to_sol;
-use std::convert::TryFrom;
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct SolanaConfirmedTransaction {
- slot: u64,
- transaction: Transaction,
- meta: Meta,
- #[serde(rename = "blockTime")]
- block_time: u64,
-}
-
-#[allow(dead_code)]
-impl SolanaConfirmedTransaction {
- pub fn extract_account_index(&self, address: String) -> usize {
- // find the equivalent of index_of(needle) in rust, and return result later
- let mut idx = 0_usize;
- for account in self.transaction.message.account_keys.iter() {
- if account.pubkey == address {
- return idx;
- }
- idx += 1;
- }
- idx
- }
-
- pub fn extract_solana_transactions(&self, solana_coin: &SolanaCoin) -> NumConversResult> {
- let mut transactions = Vec::new();
- let account_idx = self.extract_account_index(solana_coin.my_address.clone());
- for instruction in self.transaction.message.instructions.iter() {
- if instruction.is_solana_transfer() {
- let lamports = instruction.parsed.info.lamports.unwrap_or_default();
- let amount = BigDecimal::try_from(lamports_to_sol(lamports))?;
- let is_self_transfer = instruction.parsed.info.source == instruction.parsed.info.destination;
- let am_i_sender = instruction.parsed.info.source == solana_coin.my_address;
- let spent_by_me = if am_i_sender && !is_self_transfer {
- amount.clone()
- } else {
- 0.into()
- };
- let received_by_me = if is_self_transfer { amount.clone() } else { 0.into() };
- let my_balance_change = if am_i_sender {
- BigDecimal::try_from(lamports_to_sol(
- self.meta.pre_balances[account_idx] - self.meta.post_balances[account_idx],
- ))?
- } else {
- BigDecimal::try_from(lamports_to_sol(
- self.meta.post_balances[account_idx] - self.meta.pre_balances[account_idx],
- ))?
- };
- let fee = BigDecimal::try_from(lamports_to_sol(self.meta.fee))?;
- let tx = TransactionDetails {
- tx: TransactionData::new_signed(Default::default(), self.transaction.signatures[0].to_string()),
- from: vec![instruction.parsed.info.source.clone()],
- to: vec![instruction.parsed.info.destination.clone()],
- total_amount: amount,
- spent_by_me,
- received_by_me,
- my_balance_change,
- block_height: self.slot,
- timestamp: self.block_time,
- fee_details: Some(SolanaFeeDetails { amount: fee }.into()),
- coin: solana_coin.ticker.clone(),
- internal_id: Default::default(),
- kmd_rewards: None,
- transaction_type: TransactionType::StandardTransfer,
- memo: None,
- };
- transactions.push(tx);
- }
- }
- Ok(transactions)
- }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct Meta {
- err: Option,
- status: Status,
- fee: u64,
- #[serde(rename = "preBalances")]
- pre_balances: Vec,
- #[serde(rename = "postBalances")]
- post_balances: Vec,
- #[serde(rename = "innerInstructions")]
- inner_instructions: Vec>,
- #[serde(rename = "logMessages")]
- log_messages: Vec,
- #[serde(rename = "preTokenBalances")]
- pre_token_balances: Vec,
- #[serde(rename = "postTokenBalances")]
- post_token_balances: Vec,
- rewards: Vec>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct TokenBalance {
- #[serde(rename = "accountIndex")]
- account_index: u64,
- mint: String,
- #[serde(rename = "uiTokenAmount")]
- ui_token_amount: TokenAmount,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct TokenAmount {
- #[serde(rename = "uiAmount")]
- ui_amount: f64,
- decimals: u64,
- amount: String,
- #[serde(rename = "uiAmountString")]
- ui_amount_string: String,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct Status {
- #[serde(rename = "Ok")]
- ok: Option,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct Transaction {
- signatures: Vec,
- message: Message,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct Message {
- #[serde(rename = "accountKeys")]
- account_keys: Vec,
- #[serde(rename = "recentBlockhash")]
- recent_blockhash: String,
- instructions: Vec,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct AccountKey {
- pubkey: String,
- writable: bool,
- signer: bool,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct Instruction {
- program: Program,
- #[serde(rename = "programId")]
- program_id: String,
- parsed: Parsed,
-}
-
-#[allow(dead_code)]
-impl Instruction {
- pub fn is_solana_transfer(&self) -> bool {
- let is_system = match self.program {
- Program::SplToken => return false,
- Program::System => true,
- };
- let is_transfer = match self.parsed.parsed_type {
- Type::Transfer => true,
- Type::TransferChecked => true,
- Type::Unknown => false,
- };
- is_system && is_transfer && self.parsed.info.lamports.is_some()
- }
-
- // Will be used later
- pub fn is_spl_transfer(&self) -> bool {
- let is_spl_token = match self.program {
- Program::SplToken => true,
- Program::System => return false,
- };
- let is_transfer = match self.parsed.parsed_type {
- Type::Transfer => true,
- Type::TransferChecked => true,
- Type::Unknown => false,
- };
- is_spl_token && is_transfer
- }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct Parsed {
- info: Info,
- #[serde(rename = "type")]
- parsed_type: Type,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct Info {
- destination: String,
- lamports: Option,
- source: String,
- mint: Option,
- #[serde(rename = "multisigAuthority")]
- multisig_authority: Option,
- signers: Option>,
- #[serde(rename = "tokenAmount")]
- token_amount: Option,
- authority: Option,
- amount: Option,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub enum Type {
- #[serde(rename = "transfer")]
- Transfer,
- #[serde(rename = "transferChecked")]
- TransferChecked,
- Unknown,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub enum Program {
- #[serde(rename = "spl-token")]
- SplToken,
- #[serde(rename = "system")]
- System,
-}
diff --git a/mm2src/coins/solana/solana_tests.rs b/mm2src/coins/solana/solana_tests.rs
deleted file mode 100644
index fe2b104293..0000000000
--- a/mm2src/coins/solana/solana_tests.rs
+++ /dev/null
@@ -1,436 +0,0 @@
-use base58::ToBase58;
-use common::{block_on, Future01CompatExt};
-use rpc::v1::types::Bytes;
-use solana_client::rpc_request::TokenAccountsFilter;
-use solana_sdk::{bs58,
- signature::{Signature, Signer}};
-use solana_transaction_status::UiTransactionEncoding;
-use std::{ops::Neg, str::FromStr};
-
-use super::solana_common_tests::{generate_key_pair_from_iguana_seed, generate_key_pair_from_seed,
- solana_coin_for_test, SolanaNet};
-use super::solana_decode_tx_helpers::SolanaConfirmedTransaction;
-use super::*;
-use crate::{MarketCoinOps, SwapTxTypeWithSecretHash};
-
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-fn solana_keypair_from_secp() {
- let solana_key_pair = generate_key_pair_from_iguana_seed("federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron".to_string());
- assert_eq!(
- "FJktmyjV9aBHEShT4hfnLpr9ELywdwVtEL1w1rSWgbVf",
- solana_key_pair.pubkey().to_string()
- );
-
- let other_solana_keypair = generate_key_pair_from_iguana_seed("bob passphrase".to_string());
- assert_eq!(
- "B7KMMHyc3eYguUMneXRznY1NWh91HoVA2muVJetstYKE",
- other_solana_keypair.pubkey().to_string()
- );
-}
-
-// Research tests
-// TODO remove `ignore` attribute once the test is stable.
-#[test]
-#[ignore]
-#[cfg(not(target_arch = "wasm32"))]
-fn solana_prerequisites() {
- // same test as trustwallet
- {
- let fin =
- generate_key_pair_from_seed("hood vacant left trim hard mushroom device flavor ask better arrest again");
- let public_address = fin.pubkey().to_string();
- let priv_key = &fin.secret().to_bytes()[..].to_base58();
- assert_eq!(public_address.len(), 44);
- assert_eq!(public_address, "4rmosKwMH7zeaXGbej1PFybZBUyuUNQLf8RfyzCcYvkx");
- assert_eq!(priv_key, "CZtxt17aTfDrJrzwBWdVqcmFwVVptW8EX7RRnth9tT3M");
- let client = solana_client::rpc_client::RpcClient::new("https://api.testnet.solana.com/".to_string());
- let balance = client.get_balance(&fin.pubkey()).expect("Expect to retrieve balance");
- assert_eq!(balance, 0);
- }
-
- {
- let key_pair = generate_key_pair_from_iguana_seed("passphrase not really secure".to_string());
- let public_address = key_pair.pubkey().to_string();
- assert_eq!(public_address.len(), 44);
- assert_eq!(public_address, "2jTgfhf98GosnKSCXjL5YSiEa3MLrmR42yy9kZZq1i2c");
- let client = solana_client::rpc_client::RpcClient::new("https://api.testnet.solana.com/".to_string());
- let balance = client
- .get_balance(&key_pair.pubkey())
- .expect("Expect to retrieve balance");
- assert_eq!(lamports_to_sol(balance), BigDecimal::from(0));
- assert_eq!(balance, 0);
-
- // This will fetch all the balance from all tokens
- let token_accounts = client
- .get_token_accounts_by_owner(&key_pair.pubkey(), TokenAccountsFilter::ProgramId(spl_token::id()))
- .expect("");
- log!("{:?}", token_accounts);
- let actual_token_pubkey = solana_sdk::pubkey::Pubkey::from_str(token_accounts[0].pubkey.as_str()).unwrap();
- let amount = client.get_token_account_balance(&actual_token_pubkey).unwrap();
- assert_ne!(amount.ui_amount_string.as_str(), "0");
- }
-}
-
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-fn solana_coin_creation() {
- let passphrase = "federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron".to_string();
- let (_, sol_coin) = solana_coin_for_test(passphrase, SolanaNet::Testnet);
- assert_eq!(
- sol_coin.my_address().unwrap(),
- "FJktmyjV9aBHEShT4hfnLpr9ELywdwVtEL1w1rSWgbVf"
- );
-}
-
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-fn solana_my_balance() {
- let passphrase = "federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron".to_string();
- let (_, sol_coin) = solana_coin_for_test(passphrase, SolanaNet::Testnet);
- let res = block_on(sol_coin.my_balance().compat()).unwrap();
- assert_ne!(res.spendable, BigDecimal::from(0));
-}
-
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-fn solana_block_height() {
- let passphrase = "federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron".to_string();
- let (_, sol_coin) = solana_coin_for_test(passphrase, SolanaNet::Testnet);
- let res = block_on(sol_coin.current_block().compat()).unwrap();
- log!("block is : {}", res);
- assert!(res > 0);
-}
-
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-fn solana_validate_address() {
- let passphrase = "federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron".to_string();
- let (_, sol_coin) = solana_coin_for_test(passphrase, SolanaNet::Testnet);
-
- // invalid len
- let res = sol_coin.validate_address("invalidaddressobviously");
- assert!(!res.is_valid);
- let res = sol_coin.validate_address("GMtMFbuVgjDnzsBd3LLBfM4X8RyYcDGCM92tPq2PG6B2");
- assert!(res.is_valid);
-
- // Typo
- let res = sol_coin.validate_address("Fr8fraJXAe1cFU81mF7NhHTrUzXjZAJkQE1gUQ11riH");
- assert!(!res.is_valid);
-
- // invalid len
- let res = sol_coin.validate_address("r8fraJXAe1cFU81mF7NhHTrUzXjZAJkQE1gUQ11riHn");
- assert!(!res.is_valid);
-}
-
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-fn test_sign_message() {
- let passphrase = "spice describe gravity federal blast come thank unfair canal monkey style afraid".to_string();
- let (_, sol_coin) = solana_coin_for_test(passphrase, SolanaNet::Testnet);
- let signature = sol_coin.sign_message("test").unwrap();
- assert_eq!(
- signature,
- "4dzKwEteN8nch76zPMEjPX19RsaQwGTxsbtfg2bwGTkGenLfrdm31zvn9GH5rvaJBwivp6ESXx1KYR672ngs3UfF"
- );
-}
-
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-fn test_verify_message() {
- let passphrase = "spice describe gravity federal blast come thank unfair canal monkey style afraid".to_string();
- let (_, sol_coin) = solana_coin_for_test(passphrase, SolanaNet::Testnet);
- let is_valid = sol_coin
- .verify_message(
- "4dzKwEteN8nch76zPMEjPX19RsaQwGTxsbtfg2bwGTkGenLfrdm31zvn9GH5rvaJBwivp6ESXx1KYR672ngs3UfF",
- "test",
- "8UF6jSVE1jW8mSiGqt8Hft1rLwPjdKLaTfhkNozFwoAG",
- )
- .unwrap();
- assert!(is_valid);
-}
-
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-fn solana_transaction_simulations() {
- let passphrase = "federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron".to_string();
- let (_, sol_coin) = solana_coin_for_test(passphrase, SolanaNet::Devnet);
- let request_amount = BigDecimal::try_from(0.0001).unwrap();
- let valid_tx_details = block_on(
- sol_coin
- .withdraw(WithdrawRequest {
- coin: "SOL".to_string(),
- from: None,
- to: sol_coin.my_address.clone(),
- amount: request_amount.clone(),
- max: false,
- fee: None,
- memo: None,
- ibc_source_channel: None,
- })
- .compat(),
- )
- .unwrap();
- let (_, fees) = block_on(sol_coin.estimate_withdraw_fees()).unwrap();
- let sol_required = lamports_to_sol(fees);
- let expected_spent_by_me = &request_amount + &sol_required;
- assert_eq!(valid_tx_details.spent_by_me, expected_spent_by_me);
- assert_eq!(valid_tx_details.received_by_me, request_amount);
- assert_eq!(valid_tx_details.total_amount, expected_spent_by_me);
- assert_eq!(valid_tx_details.my_balance_change, sol_required.neg());
-}
-
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-fn solana_transaction_zero_balance() {
- let passphrase = "fake passphrase".to_string();
- let (_, sol_coin) = solana_coin_for_test(passphrase, SolanaNet::Devnet);
- let invalid_tx_details = block_on(
- sol_coin
- .withdraw(WithdrawRequest {
- coin: "SOL".to_string(),
- from: None,
- to: sol_coin.my_address.clone(),
- amount: BigDecimal::from_str("0.000001").unwrap(),
- max: false,
- fee: None,
- memo: None,
- ibc_source_channel: None,
- })
- .compat(),
- );
- let error = invalid_tx_details.unwrap_err();
- let (_, fees) = block_on(sol_coin.estimate_withdraw_fees()).unwrap();
- let sol_required = lamports_to_sol(fees);
- match error.into_inner() {
- WithdrawError::NotSufficientBalance { required, .. } => {
- assert_eq!(required, sol_required);
- },
- e => panic!("Unexpected err {:?}", e),
- };
-}
-
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-fn solana_transaction_simulations_not_enough_for_fees() {
- let passphrase = "non existent passphrase".to_string();
- let (_, sol_coin) = solana_coin_for_test(passphrase, SolanaNet::Devnet);
- let invalid_tx_details = block_on(
- sol_coin
- .withdraw(WithdrawRequest {
- coin: "SOL".to_string(),
- from: None,
- to: sol_coin.my_address.clone(),
- amount: BigDecimal::from(1),
- max: false,
- fee: None,
- memo: None,
- ibc_source_channel: None,
- })
- .compat(),
- );
- let error = invalid_tx_details.unwrap_err();
- let (_, fees) = block_on(sol_coin.estimate_withdraw_fees()).unwrap();
- let sol_required = lamports_to_sol(fees);
- match error.into_inner() {
- WithdrawError::NotSufficientBalance {
- coin: _,
- available,
- required,
- } => {
- assert_eq!(available, 0.into());
- assert_eq!(required, sol_required);
- },
- e => panic!("Unexpected err {:?}", e),
- };
-}
-
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-fn solana_transaction_simulations_max() {
- let passphrase = "federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron".to_string();
- let (_, sol_coin) = solana_coin_for_test(passphrase, SolanaNet::Devnet);
- let valid_tx_details = block_on(
- sol_coin
- .withdraw(WithdrawRequest {
- coin: "SOL".to_string(),
- from: None,
- to: sol_coin.my_address.clone(),
- amount: BigDecimal::from(0),
- max: true,
- fee: None,
- memo: None,
- ibc_source_channel: None,
- })
- .compat(),
- )
- .unwrap();
- let balance = block_on(sol_coin.my_balance().compat()).unwrap().spendable;
- let (_, fees) = block_on(sol_coin.estimate_withdraw_fees()).unwrap();
- let sol_required = lamports_to_sol(fees);
- assert_eq!(valid_tx_details.my_balance_change, sol_required.clone().neg());
- assert_eq!(valid_tx_details.total_amount, balance);
- assert_eq!(valid_tx_details.spent_by_me, balance);
- assert_eq!(valid_tx_details.received_by_me, &balance - &sol_required);
- log!("{:?}", valid_tx_details);
-}
-
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-fn solana_test_transactions() {
- let passphrase = "federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron".to_string();
- let (_, sol_coin) = solana_coin_for_test(passphrase, SolanaNet::Devnet);
- let valid_tx_details = block_on(
- sol_coin
- .withdraw(WithdrawRequest {
- coin: "SOL".to_string(),
- from: None,
- to: sol_coin.my_address.clone(),
- amount: BigDecimal::try_from(0.0001).unwrap(),
- max: false,
- fee: None,
- memo: None,
- ibc_source_channel: None,
- })
- .compat(),
- )
- .unwrap();
- log!("{:?}", valid_tx_details);
-
- let tx_str = hex::encode(&*valid_tx_details.tx.tx_hex().unwrap().0);
- let res = block_on(sol_coin.send_raw_tx(&tx_str).compat()).unwrap();
-
- let res2 = block_on(
- sol_coin
- .send_raw_tx_bytes(&valid_tx_details.tx.tx_hex().unwrap().0)
- .compat(),
- )
- .unwrap();
- assert_eq!(res, res2);
-
- //log!("{:?}", res);
-}
-
-// This test is just a unit test for brainstorming around tx_history for base_coin.
-#[test]
-#[ignore]
-#[cfg(not(target_arch = "wasm32"))]
-fn solana_test_tx_history() {
- let passphrase = "federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron".to_string();
- let (_, sol_coin) = solana_coin_for_test(passphrase, SolanaNet::Testnet);
- let res = sol_coin
- .client
- .get_signatures_for_address(&sol_coin.key_pair.pubkey())
- .unwrap();
- let mut history = Vec::new();
- for cur in res.iter() {
- let signature = Signature::from_str(cur.signature.clone().as_str()).unwrap();
- let res = sol_coin
- .client
- .get_transaction(&signature, UiTransactionEncoding::JsonParsed)
- .unwrap();
- log!("{}", serde_json::to_string(&res).unwrap());
- let parsed = serde_json::to_value(&res).unwrap();
- let tx_infos: SolanaConfirmedTransaction = serde_json::from_value(parsed).unwrap();
- let mut txs = tx_infos.extract_solana_transactions(&sol_coin).unwrap();
- history.append(&mut txs);
- }
- log!("{}", serde_json::to_string(&history).unwrap());
-}
-
-#[test]
-fn solana_coin_send_and_refund_maker_payment() {
- let passphrase = "federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron".to_string();
- let (_, coin) = solana_coin_for_test(passphrase, SolanaNet::Devnet);
- let solana_program_id = "3fystoi7pB1cnDEbRRpSjFJA4fG3W2vQQZ21jSrBc11B";
- let solana_program_id = bs58::decode(solana_program_id).into_vec().unwrap_or_else(|e| {
- log!("Failed to decode program ID: {}", e);
- Vec::new()
- });
-
- let pk_data = [1; 32];
- let time_lock = now_sec() - 3600;
- let taker_pub = coin.key_pair.pubkey().to_string();
- let taker_pub = Pubkey::from_str(taker_pub.as_str()).unwrap();
- let secret = [0; 32];
- let secret_hash = sha256(&secret);
-
- let args = SendPaymentArgs {
- time_lock_duration: 0,
- time_lock,
- other_pubkey: taker_pub.as_ref(),
- secret_hash: secret_hash.as_slice(),
- amount: "0.01".parse().unwrap(),
- swap_contract_address: &Some(Bytes::from(solana_program_id.clone())),
- swap_unique_data: &[],
- payment_instructions: &None,
- watcher_reward: None,
- wait_for_confirmation_until: 0,
- };
- let tx = coin.send_maker_payment(args).wait().unwrap();
- log!("swap tx {:?}", tx);
-
- let refund_args = RefundPaymentArgs {
- payment_tx: &tx.tx_hex(),
- time_lock,
- other_pubkey: taker_pub.as_ref(),
- tx_type_with_secret_hash: SwapTxTypeWithSecretHash::TakerOrMakerPayment {
- maker_secret_hash: secret_hash.as_slice(),
- },
- swap_contract_address: &Some(Bytes::from(solana_program_id)),
- swap_unique_data: pk_data.as_slice(),
- watcher_reward: false,
- };
- let refund_tx = block_on(coin.send_maker_refunds_payment(refund_args)).unwrap();
- log!("refund tx {:?}", refund_tx);
-}
-
-#[test]
-fn solana_coin_send_and_spend_maker_payment() {
- let passphrase = "federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron".to_string();
- let (_, coin) = solana_coin_for_test(passphrase, SolanaNet::Devnet);
- let solana_program_id = "3fystoi7pB1cnDEbRRpSjFJA4fG3W2vQQZ21jSrBc11B";
- let solana_program_id = bs58::decode(solana_program_id).into_vec().unwrap_or_else(|e| {
- log!("Failed to decode program ID: {}", e);
- Vec::new()
- });
-
- let pk_data = [1; 32];
- let lock_time = now_sec() - 1000;
- let taker_pub = coin.key_pair.pubkey().to_string();
- let taker_pub = Pubkey::from_str(taker_pub.as_str()).unwrap();
- let secret = [0; 32];
- let secret_hash = sha256(&secret);
-
- let maker_payment_args = SendPaymentArgs {
- time_lock_duration: 0,
- time_lock: lock_time,
- other_pubkey: taker_pub.as_ref(),
- secret_hash: secret_hash.as_slice(),
- amount: "0.01".parse().unwrap(),
- swap_contract_address: &Some(Bytes::from(solana_program_id.clone())),
- swap_unique_data: &[],
- payment_instructions: &None,
- watcher_reward: None,
- wait_for_confirmation_until: 0,
- };
-
- let tx = coin.send_maker_payment(maker_payment_args).wait().unwrap();
- log!("swap tx {:?}", tx);
-
- let maker_pub = taker_pub;
-
- let spends_payment_args = SpendPaymentArgs {
- other_payment_tx: &tx.tx_hex(),
- time_lock: lock_time,
- other_pubkey: maker_pub.as_ref(),
- secret: &secret,
- secret_hash: secret_hash.as_slice(),
- swap_contract_address: &Some(Bytes::from(solana_program_id)),
- swap_unique_data: pk_data.as_slice(),
- watcher_reward: false,
- };
-
- let spend_tx = block_on(coin.send_taker_spends_maker_payment(spends_payment_args)).unwrap();
- log!("spend tx {}", hex::encode(spend_tx.tx_hash_as_bytes().0));
-}
diff --git a/mm2src/coins/solana/spl.rs b/mm2src/coins/solana/spl.rs
deleted file mode 100644
index 7bc720e5e7..0000000000
--- a/mm2src/coins/solana/spl.rs
+++ /dev/null
@@ -1,600 +0,0 @@
-use super::{CoinBalance, HistorySyncState, MarketCoinOps, MmCoin, SwapOps, TradeFee, TransactionEnum, WatcherOps};
-use crate::coin_errors::{MyAddressError, ValidatePaymentResult};
-use crate::solana::solana_common::{ui_amount_to_amount, PrepareTransferData, SufficientBalanceError};
-use crate::solana::{solana_common, AccountError, SolanaCommonOps, SolanaFeeDetails};
-use crate::{BalanceFut, CheckIfMyPaymentSentArgs, CoinFutSpawner, ConfirmPaymentInput, DexFee, FeeApproxStage,
- FoundSwapTxSpend, MakerSwapTakerCoin, MmCoinEnum, NegotiateSwapContractAddrErr, PaymentInstructionArgs,
- PaymentInstructions, PaymentInstructionsErr, RawTransactionError, RawTransactionFut,
- RawTransactionRequest, RawTransactionResult, RefundError, RefundPaymentArgs, RefundResult,
- SearchForSwapTxSpendInput, SendMakerPaymentSpendPreimageInput, SendPaymentArgs, SignRawTransactionRequest,
- SignatureResult, SolanaCoin, SpendPaymentArgs, TakerSwapMakerCoin, TradePreimageFut, TradePreimageResult,
- TradePreimageValue, TransactionData, TransactionDetails, TransactionFut, TransactionResult,
- TransactionType, TxMarshalingErr, UnexpectedDerivationMethod, ValidateAddressResult, ValidateFeeArgs,
- ValidateInstructionsErr, ValidateOtherPubKeyErr, ValidatePaymentError, ValidatePaymentFut,
- ValidatePaymentInput, ValidateWatcherSpendInput, VerificationResult, WaitForHTLCTxSpendArgs,
- WatcherReward, WatcherRewardError, WatcherSearchForSwapTxSpendInput, WatcherValidatePaymentInput,
- WatcherValidateTakerFeeInput, WithdrawError, WithdrawFut, WithdrawRequest, WithdrawResult};
-use async_trait::async_trait;
-use bincode::serialize;
-use common::executor::{abortable_queue::AbortableQueue, AbortableSystem, AbortedError};
-use common::{async_blocking, now_sec};
-use futures::{FutureExt, TryFutureExt};
-use futures01::Future;
-use keys::KeyPair;
-use mm2_core::mm_ctx::MmArc;
-use mm2_err_handle::prelude::*;
-use mm2_number::{BigDecimal, MmNumber};
-use rpc::v1::types::Bytes as BytesJson;
-use serde_json::Value as Json;
-use solana_client::{rpc_client::RpcClient, rpc_request::TokenAccountsFilter};
-use solana_sdk::message::Message;
-use solana_sdk::transaction::Transaction;
-use solana_sdk::{pubkey::Pubkey, signature::Signer};
-use spl_associated_token_account::{create_associated_token_account, get_associated_token_address};
-use std::{convert::TryFrom,
- fmt::{Debug, Formatter, Result as FmtResult},
- str::FromStr,
- sync::Arc};
-
-#[derive(Debug)]
-pub enum SplTokenCreationError {
- InvalidPubkey(String),
- Internal(String),
-}
-
-impl From for SplTokenCreationError {
- fn from(e: AbortedError) -> Self { SplTokenCreationError::Internal(e.to_string()) }
-}
-
-pub struct SplTokenFields {
- pub decimals: u8,
- pub ticker: String,
- pub token_contract_address: Pubkey,
- pub abortable_system: AbortableQueue,
-}
-
-#[derive(Clone, Debug)]
-pub struct SplTokenInfo {
- pub token_contract_address: Pubkey,
- pub decimals: u8,
-}
-
-#[derive(Debug)]
-pub struct SplProtocolConf {
- pub platform_coin_ticker: String,
- pub decimals: u8,
- pub token_contract_address: String,
-}
-
-#[derive(Clone)]
-pub struct SplToken {
- pub conf: Arc,
- pub platform_coin: SolanaCoin,
-}
-
-impl Debug for SplToken {
- fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult { f.write_str(&self.conf.ticker) }
-}
-
-impl SplToken {
- pub fn new(
- decimals: u8,
- ticker: String,
- token_address: String,
- platform_coin: SolanaCoin,
- ) -> MmResult {
- let token_contract_address = solana_sdk::pubkey::Pubkey::from_str(&token_address)
- .map_err(|e| MmError::new(SplTokenCreationError::InvalidPubkey(format!("{:?}", e))))?;
-
- // Create an abortable system linked to the `platform_coin` so if the platform coin is disabled,
- // all spawned futures related to `SplToken` will be aborted as well.
- let abortable_system = platform_coin.abortable_system.create_subsystem()?;
-
- let conf = Arc::new(SplTokenFields {
- decimals,
- ticker,
- token_contract_address,
- abortable_system,
- });
- Ok(SplToken { conf, platform_coin })
- }
-
- pub fn get_info(&self) -> SplTokenInfo {
- SplTokenInfo {
- token_contract_address: self.conf.token_contract_address,
- decimals: self.decimals(),
- }
- }
-}
-
-async fn withdraw_spl_token_impl(coin: SplToken, req: WithdrawRequest) -> WithdrawResult {
- let (hash, fees) = coin.platform_coin.estimate_withdraw_fees().await?;
- let res = coin
- .check_balance_and_prepare_transfer(req.max, req.amount.clone(), fees)
- .await?;
- let system_destination_pubkey = solana_sdk::pubkey::Pubkey::try_from(&*req.to)?;
- let contract_key = coin.get_underlying_contract_pubkey();
- let auth_key = coin.platform_coin.key_pair.pubkey();
- let funding_address = coin.get_pubkey().await?;
- let dest_token_address = get_associated_token_address(&system_destination_pubkey, &contract_key);
- let mut instructions = Vec::with_capacity(1);
- let account_info = async_blocking({
- let coin = coin.clone();
- move || coin.rpc().get_account(&dest_token_address)
- })
- .await;
- if account_info.is_err() {
- let instruction_creation = create_associated_token_account(&auth_key, &dest_token_address, &contract_key);
- instructions.push(instruction_creation);
- }
- let amount = ui_amount_to_amount(req.amount, coin.conf.decimals)?;
- let instruction_transfer_checked = spl_token::instruction::transfer_checked(
- &spl_token::id(),
- &funding_address,
- &contract_key,
- &dest_token_address,
- &auth_key,
- &[&auth_key],
- amount,
- coin.conf.decimals,
- )?;
- instructions.push(instruction_transfer_checked);
- let msg = Message::new(&instructions, Some(&auth_key));
- let signers = vec![&coin.platform_coin.key_pair];
- let tx = Transaction::new(&signers, msg, hash);
- let serialized_tx = serialize(&tx).map_to_mm(|e| WithdrawError::InternalError(e.to_string()))?;
- let received_by_me = if req.to == coin.platform_coin.my_address {
- res.to_send.clone()
- } else {
- 0.into()
- };
- Ok(TransactionDetails {
- tx: TransactionData::new_signed(serialized_tx.into(), tx.signatures[0].to_string()),
- from: vec![coin.platform_coin.my_address.clone()],
- to: vec![req.to],
- total_amount: res.to_send.clone(),
- spent_by_me: res.to_send.clone(),
- my_balance_change: &received_by_me - &res.to_send,
- received_by_me,
- block_height: 0,
- timestamp: now_sec(),
- fee_details: Some(
- SolanaFeeDetails {
- amount: res.sol_required,
- }
- .into(),
- ),
- coin: coin.conf.ticker.clone(),
- internal_id: vec![].into(),
- kmd_rewards: None,
- transaction_type: TransactionType::StandardTransfer,
- memo: None,
- })
-}
-
-async fn withdraw_impl(coin: SplToken, req: WithdrawRequest) -> WithdrawResult {
- let validate_address_result = coin.validate_address(&req.to);
- if !validate_address_result.is_valid {
- return MmError::err(WithdrawError::InvalidAddress(
- validate_address_result.reason.unwrap_or_else(|| "Unknown".to_string()),
- ));
- }
- withdraw_spl_token_impl(coin, req).await
-}
-
-#[async_trait]
-impl SolanaCommonOps for SplToken {
- fn rpc(&self) -> &RpcClient { &self.platform_coin.client }
-
- fn is_token(&self) -> bool { true }
-
- async fn check_balance_and_prepare_transfer(
- &self,
- max: bool,
- amount: BigDecimal,
- fees: u64,
- ) -> Result> {
- solana_common::check_balance_and_prepare_transfer(self, max, amount, fees).await
- }
-}
-
-impl SplToken {
- fn get_underlying_contract_pubkey(&self) -> Pubkey { self.conf.token_contract_address }
-
- async fn get_pubkey(&self) -> Result> {
- let coin = self.clone();
- let token_accounts = async_blocking(move || {
- coin.rpc().get_token_accounts_by_owner(
- &coin.platform_coin.key_pair.pubkey(),
- TokenAccountsFilter::Mint(coin.get_underlying_contract_pubkey()),
- )
- })
- .await?;
- if token_accounts.is_empty() {
- return MmError::err(AccountError::NotFundedError("account_not_funded".to_string()));
- }
- Ok(Pubkey::from_str(&token_accounts[0].pubkey)?)
- }
-
- fn my_balance_impl(&self) -> BalanceFut {
- let coin = self.clone();
- let fut = async move {
- coin.platform_coin
- .my_balance_spl(SplTokenInfo {
- token_contract_address: coin.conf.token_contract_address,
- decimals: coin.conf.decimals,
- })
- .await
- };
- Box::new(fut.boxed().compat())
- }
-}
-
-#[async_trait]
-impl MarketCoinOps for SplToken {
- fn ticker(&self) -> &str { &self.conf.ticker }
-
- fn my_address(&self) -> MmResult { Ok(self.platform_coin.my_address.clone()) }
-
- 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 {
- solana_common::sign_message(&self.platform_coin, message)
- }
-
- fn verify_message(&self, signature: &str, message: &str, pubkey_bs58: &str) -> VerificationResult {
- solana_common::verify_message(&self.platform_coin, signature, message, pubkey_bs58)
- }
-
- fn my_balance(&self) -> BalanceFut {
- let fut = self.my_balance_impl().and_then(Ok);
- Box::new(fut)
- }
-
- fn base_coin_balance(&self) -> BalanceFut { self.platform_coin.base_coin_balance() }
-
- fn platform_ticker(&self) -> &str { self.platform_coin.ticker() }
-
- #[inline(always)]
- fn send_raw_tx(&self, tx: &str) -> Box + Send> {
- self.platform_coin.send_raw_tx(tx)
- }
-
- #[inline(always)]
- fn send_raw_tx_bytes(&self, tx: &[u8]) -> Box + Send> {
- self.platform_coin.send_raw_tx_bytes(tx)
- }
-
- #[inline(always)]
- async fn sign_raw_tx(&self, _args: &SignRawTransactionRequest) -> RawTransactionResult {
- MmError::err(RawTransactionError::NotImplemented {
- coin: self.ticker().to_string(),
- })
- }
-
- fn wait_for_confirmations(&self, _input: ConfirmPaymentInput) -> Box + Send> {
- unimplemented!()
- }
-
- fn wait_for_htlc_tx_spend(&self, args: WaitForHTLCTxSpendArgs<'_>) -> TransactionFut { unimplemented!() }
-
- fn tx_enum_from_bytes(&self, _bytes: &[u8]) -> Result> {
- MmError::err(TxMarshalingErr::NotSupported(
- "tx_enum_from_bytes is not supported for Spl yet.".to_string(),
- ))
- }
-
- fn current_block(&self) -> Box + Send> { self.platform_coin.current_block() }
-
- fn display_priv_key(&self) -> Result { self.platform_coin.display_priv_key() }
-
- fn min_tx_amount(&self) -> BigDecimal { BigDecimal::from(0) }
-
- fn min_trading_vol(&self) -> MmNumber { MmNumber::from("0.00777") }
-
- fn is_trezor(&self) -> bool { self.platform_coin.is_trezor() }
-}
-
-#[async_trait]
-impl SwapOps for SplToken {
- fn send_taker_fee(&self, _fee_addr: &[u8], dex_fee: DexFee, _uuid: &[u8], _expire_at: u64) -> TransactionFut {
- unimplemented!()
- }
-
- fn send_maker_payment(&self, _maker_payment_args: SendPaymentArgs) -> TransactionFut { unimplemented!() }
-
- fn send_taker_payment(&self, _taker_payment_args: SendPaymentArgs) -> TransactionFut { unimplemented!() }
-
- async fn send_maker_spends_taker_payment(
- &self,
- _maker_spends_payment_args: SpendPaymentArgs<'_>,
- ) -> TransactionResult {
- unimplemented!()
- }
-
- async fn send_taker_spends_maker_payment(
- &self,
- _taker_spends_payment_args: SpendPaymentArgs<'_>,
- ) -> TransactionResult {
- unimplemented!()
- }
-
- async fn send_taker_refunds_payment(
- &self,
- _taker_refunds_payment_args: RefundPaymentArgs<'_>,
- ) -> TransactionResult {
- unimplemented!()
- }
-
- async fn send_maker_refunds_payment(
- &self,
- _maker_refunds_payment_args: RefundPaymentArgs<'_>,
- ) -> TransactionResult {
- todo!()
- }
-
- fn validate_fee(&self, _validate_fee_args: ValidateFeeArgs) -> ValidatePaymentFut<()> { unimplemented!() }
-
- async fn validate_maker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentResult<()> {
- unimplemented!()
- }
-
- async fn validate_taker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentResult<()> {
- unimplemented!()
- }
-
- fn check_if_my_payment_sent(
- &self,
- _if_my_payment_sent_args: CheckIfMyPaymentSentArgs,
- ) -> Box, Error = String> + Send> {
- unimplemented!()
- }
-
- async fn search_for_swap_tx_spend_my(
- &self,
- _: SearchForSwapTxSpendInput<'_>,
- ) -> Result, String> {
- unimplemented!()
- }
-
- async fn search_for_swap_tx_spend_other(
- &self,
- _: SearchForSwapTxSpendInput<'_>,
- ) -> Result, String> {
- unimplemented!()
- }
-
- fn check_tx_signed_by_pub(&self, tx: &[u8], expected_pub: &[u8]) -> Result> {
- unimplemented!();
- }
-
- async fn extract_secret(
- &self,
- secret_hash: &[u8],
- spend_tx: &[u8],
- watcher_reward: bool,
- ) -> Result, String> {
- unimplemented!()
- }
-
- fn is_auto_refundable(&self) -> bool { false }
-
- async fn wait_for_htlc_refund(&self, _tx: &[u8], _locktime: u64) -> RefundResult<()> {
- MmError::err(RefundError::Internal(
- "wait_for_htlc_refund is not supported for this coin!".into(),
- ))
- }
-
- fn negotiate_swap_contract_addr(
- &self,
- _other_side_address: Option<&[u8]>,
- ) -> Result, MmError> {
- unimplemented!()
- }
-
- #[inline]
- fn derive_htlc_key_pair(&self, _swap_unique_data: &[u8]) -> KeyPair { todo!() }
-
- #[inline]
- fn derive_htlc_pubkey(&self, swap_unique_data: &[u8]) -> Vec {
- self.derive_htlc_key_pair(swap_unique_data).public_slice().to_vec()
- }
-
- fn validate_other_pubkey(&self, _raw_pubkey: &[u8]) -> MmResult<(), ValidateOtherPubKeyErr> { unimplemented!() }
-
- async fn maker_payment_instructions(
- &self,
- _args: PaymentInstructionArgs<'_>,
- ) -> Result>, MmError> {
- unimplemented!()
- }
-
- async fn taker_payment_instructions(
- &self,
- _args: PaymentInstructionArgs<'_>,
- ) -> Result>, MmError> {
- unimplemented!()
- }
-
- fn validate_maker_payment_instructions(
- &self,
- _instructions: &[u8],
- _args: PaymentInstructionArgs<'_>,
- ) -> Result> {
- unimplemented!()
- }
-
- fn validate_taker_payment_instructions(
- &self,
- _instructions: &[u8],
- _args: PaymentInstructionArgs<'_>,
- ) -> Result> {
- unimplemented!()
- }
-}
-
-#[async_trait]
-impl TakerSwapMakerCoin for SplToken {
- async fn on_taker_payment_refund_start(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
-
- async fn on_taker_payment_refund_success(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
-}
-
-#[async_trait]
-impl MakerSwapTakerCoin for SplToken {
- async fn on_maker_payment_refund_start(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
-
- async fn on_maker_payment_refund_success(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
-}
-
-#[async_trait]
-impl WatcherOps for SplToken {
- fn send_maker_payment_spend_preimage(&self, _input: SendMakerPaymentSpendPreimageInput) -> TransactionFut {
- unimplemented!();
- }
-
- fn create_taker_payment_refund_preimage(
- &self,
- _taker_payment_tx: &[u8],
- _time_lock: u64,
- _maker_pub: &[u8],
- _secret_hash: &[u8],
- _swap_contract_address: &Option,
- _swap_unique_data: &[u8],
- ) -> TransactionFut {
- unimplemented!();
- }
-
- fn create_maker_payment_spend_preimage(
- &self,
- _maker_payment_tx: &[u8],
- _time_lock: u64,
- _maker_pub: &[u8],
- _secret_hash: &[u8],
- _swap_unique_data: &[u8],
- ) -> TransactionFut {
- unimplemented!();
- }
-
- fn send_taker_payment_refund_preimage(&self, _watcher_refunds_payment_args: RefundPaymentArgs) -> TransactionFut {
- unimplemented!();
- }
-
- fn watcher_validate_taker_fee(&self, _input: WatcherValidateTakerFeeInput) -> ValidatePaymentFut<()> {
- unimplemented!();
- }
-
- fn watcher_validate_taker_payment(&self, _input: WatcherValidatePaymentInput) -> ValidatePaymentFut<()> {
- unimplemented!();
- }
-
- fn taker_validates_payment_spend_or_refund(&self, _input: ValidateWatcherSpendInput) -> ValidatePaymentFut<()> {
- unimplemented!()
- }
-
- async fn watcher_search_for_swap_tx_spend(
- &self,
- input: WatcherSearchForSwapTxSpendInput<'_>,
- ) -> Result, String> {
- unimplemented!();
- }
-
- async fn get_taker_watcher_reward(
- &self,
- other_coin: &MmCoinEnum,
- coin_amount: Option,
- other_coin_amount: Option,
- reward_amount: Option,
- wait_until: u64,
- ) -> Result> {
- unimplemented!();
- }
-
- async fn get_maker_watcher_reward(
- &self,
- other_coin: &MmCoinEnum,
- reward_amount: Option,
- wait_until: u64,
- ) -> Result, MmError> {
- unimplemented!();
- }
-}
-
-#[async_trait]
-impl MmCoin for SplToken {
- fn is_asset_chain(&self) -> bool { false }
-
- fn spawner(&self) -> CoinFutSpawner { CoinFutSpawner::new(&self.conf.abortable_system) }
-
- fn withdraw(&self, req: WithdrawRequest) -> WithdrawFut {
- Box::new(Box::pin(withdraw_impl(self.clone(), req)).compat())
- }
-
- fn get_raw_transaction(&self, _req: RawTransactionRequest) -> RawTransactionFut { unimplemented!() }
-
- fn get_tx_hex_by_hash(&self, tx_hash: Vec) -> RawTransactionFut { unimplemented!() }
-
- fn decimals(&self) -> u8 { self.conf.decimals }
-
- fn convert_to_address(&self, _from: &str, _to_address_format: Json) -> Result { unimplemented!() }
-
- fn validate_address(&self, address: &str) -> ValidateAddressResult { self.platform_coin.validate_address(address) }
-
- fn process_history_loop(&self, _ctx: MmArc) -> Box + Send> { unimplemented!() }
-
- fn history_sync_status(&self) -> HistorySyncState { unimplemented!() }
-
- /// Get fee to be paid per 1 swap transaction
- fn get_trade_fee(&self) -> Box + Send> { unimplemented!() }
-
- async fn get_sender_trade_fee(
- &self,
- _value: TradePreimageValue,
- _stage: FeeApproxStage,
- _include_refund_fee: bool,
- ) -> TradePreimageResult {
- unimplemented!()
- }
-
- fn get_receiver_trade_fee(&self, _stage: FeeApproxStage) -> TradePreimageFut { unimplemented!() }
-
- async fn get_fee_to_send_taker_fee(
- &self,
- _dex_fee_amount: DexFee,
- _stage: FeeApproxStage,
- ) -> TradePreimageResult {
- unimplemented!()
- }
-
- fn required_confirmations(&self) -> u64 { 1 }
-
- fn requires_notarization(&self) -> bool { false }
-
- fn set_required_confirmations(&self, _confirmations: u64) { unimplemented!() }
-
- fn set_requires_notarization(&self, _requires_nota: bool) { unimplemented!() }
-
- fn swap_contract_address(&self) -> Option { unimplemented!() }
-
- fn fallback_swap_contract(&self) -> Option { unimplemented!() }
-
- fn mature_confirmations(&self) -> Option { Some(1) }
-
- fn coin_protocol_info(&self, _amount_to_receive: Option) -> Vec { Vec::new() }
-
- fn is_coin_protocol_supported(
- &self,
- _info: &Option>,
- _amount_to_send: Option,
- _locktime: u64,
- _is_maker: bool,
- ) -> bool {
- true
- }
-
- fn on_disabled(&self) -> Result<(), AbortedError> { self.conf.abortable_system.abort_all() }
-
- fn on_token_deactivated(&self, _ticker: &str) {}
-}
diff --git a/mm2src/coins/solana/spl_tests.rs b/mm2src/coins/solana/spl_tests.rs
deleted file mode 100644
index 10943e6e33..0000000000
--- a/mm2src/coins/solana/spl_tests.rs
+++ /dev/null
@@ -1,138 +0,0 @@
-use super::*;
-use crate::{solana::solana_common_tests::solana_coin_for_test,
- solana::solana_common_tests::{spl_coin_for_test, SolanaNet}};
-use common::{block_on, Future01CompatExt};
-use std::ops::Neg;
-use std::str::FromStr;
-
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-fn spl_coin_creation() {
- let passphrase = "federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron".to_string();
- let (_, sol_coin) = solana_coin_for_test(passphrase, SolanaNet::Testnet);
- let sol_spl_usdc_coin = spl_coin_for_test(
- sol_coin,
- "USDC".to_string(),
- 6,
- solana_sdk::pubkey::Pubkey::from_str("CpMah17kQEL2wqyMKt3mZBdTnZbkbfx4nqmQMFDP5vwp").unwrap(),
- );
-
- log!("address: {}", sol_spl_usdc_coin.my_address().unwrap());
- assert_eq!(
- sol_spl_usdc_coin.my_address().unwrap(),
- "FJktmyjV9aBHEShT4hfnLpr9ELywdwVtEL1w1rSWgbVf"
- );
-}
-
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-fn test_sign_message() {
- let passphrase = "spice describe gravity federal blast come thank unfair canal monkey style afraid".to_string();
- let (_, sol_coin) = solana_coin_for_test(passphrase, SolanaNet::Testnet);
- let sol_spl_usdc_coin = spl_coin_for_test(
- sol_coin,
- "USDC".to_string(),
- 6,
- solana_sdk::pubkey::Pubkey::from_str("CpMah17kQEL2wqyMKt3mZBdTnZbkbfx4nqmQMFDP5vwp").unwrap(),
- );
- let signature = sol_spl_usdc_coin.sign_message("test").unwrap();
- assert_eq!(
- signature,
- "4dzKwEteN8nch76zPMEjPX19RsaQwGTxsbtfg2bwGTkGenLfrdm31zvn9GH5rvaJBwivp6ESXx1KYR672ngs3UfF"
- );
-}
-
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-fn test_verify_message() {
- let passphrase = "spice describe gravity federal blast come thank unfair canal monkey style afraid".to_string();
- let (_, sol_coin) = solana_coin_for_test(passphrase, SolanaNet::Testnet);
- let sol_spl_usdc_coin = spl_coin_for_test(
- sol_coin,
- "USDC".to_string(),
- 6,
- solana_sdk::pubkey::Pubkey::from_str("CpMah17kQEL2wqyMKt3mZBdTnZbkbfx4nqmQMFDP5vwp").unwrap(),
- );
- let is_valid = sol_spl_usdc_coin
- .verify_message(
- "4dzKwEteN8nch76zPMEjPX19RsaQwGTxsbtfg2bwGTkGenLfrdm31zvn9GH5rvaJBwivp6ESXx1KYR672ngs3UfF",
- "test",
- "8UF6jSVE1jW8mSiGqt8Hft1rLwPjdKLaTfhkNozFwoAG",
- )
- .unwrap();
- assert!(is_valid);
-}
-
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-fn spl_my_balance() {
- let passphrase = "federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron".to_string();
- let (_, sol_coin) = solana_coin_for_test(passphrase, SolanaNet::Testnet);
- let sol_spl_usdc_coin = spl_coin_for_test(
- sol_coin.clone(),
- "USDC".to_string(),
- 6,
- solana_sdk::pubkey::Pubkey::from_str("CpMah17kQEL2wqyMKt3mZBdTnZbkbfx4nqmQMFDP5vwp").unwrap(),
- );
-
- let res = block_on(sol_spl_usdc_coin.my_balance().compat()).unwrap();
- assert_ne!(res.spendable, BigDecimal::from(0));
- assert!(res.spendable < BigDecimal::from(10));
-
- let sol_spl_wsol_coin = spl_coin_for_test(
- sol_coin,
- "WSOL".to_string(),
- 8,
- solana_sdk::pubkey::Pubkey::from_str("So11111111111111111111111111111111111111112").unwrap(),
- );
- let res = block_on(sol_spl_wsol_coin.my_balance().compat()).unwrap();
- assert_eq!(res.spendable, BigDecimal::from(0));
-}
-
-// Stop ignoring when Solana is released
-#[test]
-#[ignore]
-#[cfg(not(target_arch = "wasm32"))]
-fn test_spl_transactions() {
- let passphrase = "federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron".to_string();
- let (_, sol_coin) = solana_coin_for_test(passphrase, SolanaNet::Testnet);
- let usdc_sol_coin = spl_coin_for_test(
- sol_coin,
- "USDC".to_string(),
- 6,
- solana_sdk::pubkey::Pubkey::from_str("CpMah17kQEL2wqyMKt3mZBdTnZbkbfx4nqmQMFDP5vwp").unwrap(),
- );
- let withdraw_amount = BigDecimal::from_str("0.0001").unwrap();
- let valid_tx_details = block_on(
- usdc_sol_coin
- .withdraw(WithdrawRequest {
- coin: "USDC".to_string(),
- from: None,
- to: "AYJmtzc9D4KU6xsDzhKShFyYKUNXY622j9QoQEo4LfpX".to_string(),
- amount: withdraw_amount.clone(),
- max: false,
- fee: None,
- memo: None,
- ibc_source_channel: None,
- })
- .compat(),
- )
- .unwrap();
- log!("{:?}", valid_tx_details);
- assert_eq!(valid_tx_details.total_amount, withdraw_amount);
- assert_eq!(valid_tx_details.my_balance_change, withdraw_amount.neg());
- assert_eq!(valid_tx_details.coin, "USDC".to_string());
- assert_ne!(valid_tx_details.timestamp, 0);
-
- let tx_str = hex::encode(&*valid_tx_details.tx.tx_hex().unwrap().0);
- let res = block_on(usdc_sol_coin.send_raw_tx(&tx_str).compat()).unwrap();
- log!("{:?}", res);
-
- let res2 = block_on(
- usdc_sol_coin
- .send_raw_tx_bytes(&valid_tx_details.tx.tx_hex().unwrap().0)
- .compat(),
- )
- .unwrap();
- assert_eq!(res, res2);
-}
diff --git a/mm2src/coins/tendermint/htlc/iris/htlc.rs b/mm2src/coins/tendermint/htlc/iris/htlc.rs
index 09561a4048..59cfb5cd73 100644
--- a/mm2src/coins/tendermint/htlc/iris/htlc.rs
+++ b/mm2src/coins/tendermint/htlc/iris/htlc.rs
@@ -1,12 +1,9 @@
use super::htlc_proto::{IrisClaimHtlcProto, IrisCreateHtlcProto};
-use cosmrs::proto::traits::TypeUrl;
+use cosmrs::proto::traits::Name;
use cosmrs::{tx::Msg, AccountId, Coin, ErrorReport};
use std::convert::TryFrom;
-pub(crate) const IRIS_CREATE_HTLC_TYPE_URL: &str = "/irismod.htlc.MsgCreateHTLC";
-pub(crate) const IRIS_CLAIM_HTLC_TYPE_URL: &str = "/irismod.htlc.MsgClaimHTLC";
-
#[derive(Clone, Debug, Eq, PartialEq)]
pub(crate) struct IrisCreateHtlcMsg {
/// Sender's address.
@@ -87,8 +84,9 @@ impl From<&IrisCreateHtlcMsg> for IrisCreateHtlcProto {
}
}
-impl TypeUrl for IrisCreateHtlcProto {
- const TYPE_URL: &'static str = IRIS_CREATE_HTLC_TYPE_URL;
+impl Name for IrisCreateHtlcProto {
+ const NAME: &'static str = "MsgCreateHTLC";
+ const PACKAGE: &'static str = "irismod.htlc";
}
#[derive(Clone)]
@@ -141,6 +139,7 @@ impl From<&IrisClaimHtlcMsg> for IrisClaimHtlcProto {
}
}
-impl TypeUrl for IrisClaimHtlcProto {
- const TYPE_URL: &'static str = IRIS_CLAIM_HTLC_TYPE_URL;
+impl Name for IrisClaimHtlcProto {
+ const NAME: &'static str = "MsgClaimHTLC";
+ const PACKAGE: &'static str = "irismod.htlc";
}
diff --git a/mm2src/coins/tendermint/htlc/nucleus/htlc.rs b/mm2src/coins/tendermint/htlc/nucleus/htlc.rs
index a768f7fd4a..2c423285bf 100644
--- a/mm2src/coins/tendermint/htlc/nucleus/htlc.rs
+++ b/mm2src/coins/tendermint/htlc/nucleus/htlc.rs
@@ -1,12 +1,9 @@
use super::htlc_proto::{NucleusClaimHtlcProto, NucleusCreateHtlcProto};
-use cosmrs::proto::traits::TypeUrl;
+use cosmrs::proto::traits::Name;
use cosmrs::{tx::Msg, AccountId, Coin, ErrorReport};
use std::convert::TryFrom;
-pub(crate) const NUCLEUS_CREATE_HTLC_TYPE_URL: &str = "/nucleus.htlc.MsgCreateHTLC";
-pub(crate) const NUCLEUS_CLAIM_HTLC_TYPE_URL: &str = "/nucleus.htlc.MsgClaimHTLC";
-
#[derive(Clone, Debug, Eq, PartialEq)]
pub(crate) struct NucleusCreateHtlcMsg {
/// Sender's address.
@@ -72,8 +69,9 @@ impl From<&NucleusCreateHtlcMsg> for NucleusCreateHtlcProto {
}
}
-impl TypeUrl for NucleusCreateHtlcProto {
- const TYPE_URL: &'static str = NUCLEUS_CREATE_HTLC_TYPE_URL;
+impl Name for NucleusCreateHtlcProto {
+ const NAME: &'static str = "MsgCreateHTLC";
+ const PACKAGE: &'static str = "nucleus.htlc";
}
#[derive(Clone)]
@@ -126,6 +124,7 @@ impl From<&NucleusClaimHtlcMsg> for NucleusClaimHtlcProto {
}
}
-impl TypeUrl for NucleusClaimHtlcProto {
- const TYPE_URL: &'static str = NUCLEUS_CLAIM_HTLC_TYPE_URL;
+impl Name for NucleusClaimHtlcProto {
+ const NAME: &'static str = "MsgClaimHTLC";
+ const PACKAGE: &'static str = "nucleus.htlc";
}
diff --git a/mm2src/coins/tendermint/ibc/mod.rs b/mm2src/coins/tendermint/ibc/mod.rs
index 51df375ab1..9e1c905398 100644
--- a/mm2src/coins/tendermint/ibc/mod.rs
+++ b/mm2src/coins/tendermint/ibc/mod.rs
@@ -1,7 +1,6 @@
mod ibc_proto;
pub(crate) mod transfer_v1;
-pub(crate) const IBC_TRANSFER_TYPE_URL: &str = "/ibc.applications.transfer.v1.MsgTransfer";
pub(crate) const IBC_OUT_SOURCE_PORT: &str = "transfer";
pub(crate) const IBC_OUT_TIMEOUT_IN_NANOS: u64 = 60000000000 * 15; // 15 minutes
pub(crate) const IBC_GAS_LIMIT_DEFAULT: u64 = 150_000;
diff --git a/mm2src/coins/tendermint/ibc/transfer_v1.rs b/mm2src/coins/tendermint/ibc/transfer_v1.rs
index c5780e32b7..22bad1fefe 100644
--- a/mm2src/coins/tendermint/ibc/transfer_v1.rs
+++ b/mm2src/coins/tendermint/ibc/transfer_v1.rs
@@ -1,6 +1,5 @@
use super::{ibc_proto::IBCTransferV1Proto, IBC_OUT_SOURCE_PORT, IBC_OUT_TIMEOUT_IN_NANOS};
-use crate::tendermint::ibc::IBC_TRANSFER_TYPE_URL;
-use cosmrs::proto::traits::TypeUrl;
+use cosmrs::proto::traits::Name;
use cosmrs::{tx::Msg, AccountId, Coin, ErrorReport};
use std::convert::TryFrom;
@@ -99,6 +98,7 @@ impl From<&MsgTransfer> for IBCTransferV1Proto {
}
}
-impl TypeUrl for IBCTransferV1Proto {
- const TYPE_URL: &'static str = IBC_TRANSFER_TYPE_URL;
+impl Name for IBCTransferV1Proto {
+ const NAME: &'static str = "MsgTransfer";
+ const PACKAGE: &'static str = "ibc.applications.transfer.v1";
}
diff --git a/mm2src/coins/tendermint/tendermint_coin.rs b/mm2src/coins/tendermint/tendermint_coin.rs
index bc5e12f6ff..de1753cffe 100644
--- a/mm2src/coins/tendermint/tendermint_coin.rs
+++ b/mm2src/coins/tendermint/tendermint_coin.rs
@@ -2531,13 +2531,13 @@ impl MarketCoinOps for TendermintCoin {
let broadcast_res = try_s!(try_s!(coin.rpc_client().await).broadcast_tx_commit(tx_bytes).await);
if broadcast_res.check_tx.log.contains(ACCOUNT_SEQUENCE_ERR)
- || broadcast_res.deliver_tx.log.contains(ACCOUNT_SEQUENCE_ERR)
+ || broadcast_res.tx_result.log.contains(ACCOUNT_SEQUENCE_ERR)
{
return ERR!(
"{}. check_tx log: {}, deliver_tx log: {}",
ACCOUNT_SEQUENCE_ERR,
broadcast_res.check_tx.log,
- broadcast_res.deliver_tx.log
+ broadcast_res.tx_result.log
);
}
@@ -2545,8 +2545,8 @@ impl MarketCoinOps for TendermintCoin {
return ERR!("Tx check failed {:?}", broadcast_res.check_tx);
}
- if !broadcast_res.deliver_tx.code.is_ok() {
- return ERR!("Tx deliver failed {:?}", broadcast_res.deliver_tx);
+ if !broadcast_res.tx_result.code.is_ok() {
+ return ERR!("Tx deliver failed {:?}", broadcast_res.tx_result);
}
Ok(broadcast_res.hash.to_string())
};
@@ -3313,7 +3313,7 @@ fn parse_expected_sequence_number(e: &str) -> MmResult {
@@ -3725,18 +3723,16 @@ pub mod tendermint_coin_tests {
data: TxRaw::decode(random_transfer_tx_bytes.as_slice()).unwrap(),
});
- let error = coin
- .validate_fee(ValidateFeeArgs {
- fee_tx: &random_transfer_tx,
- expected_sender: &[],
- fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
- dex_fee: &DexFee::Standard(invalid_amount.clone()),
- min_block_number: 0,
- uuid: &[1; 16],
- })
- .wait()
- .unwrap_err()
- .into_inner();
+ let error = block_on_f01(coin.validate_fee(ValidateFeeArgs {
+ fee_tx: &random_transfer_tx,
+ expected_sender: &[],
+ fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
+ dex_fee: &DexFee::Standard(invalid_amount.clone()),
+ min_block_number: 0,
+ uuid: &[1; 16],
+ }))
+ .unwrap_err()
+ .into_inner();
println!("{}", error);
match error {
ValidatePaymentError::WrongPaymentTx(err) => assert!(err.contains("sent to wrong address")),
@@ -3758,18 +3754,16 @@ pub mod tendermint_coin_tests {
data: TxRaw::decode(dex_fee_tx.encode_to_vec().as_slice()).unwrap(),
});
- let error = coin
- .validate_fee(ValidateFeeArgs {
- fee_tx: &dex_fee_tx,
- expected_sender: &[],
- fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
- dex_fee: &DexFee::Standard(invalid_amount),
- min_block_number: 0,
- uuid: &[1; 16],
- })
- .wait()
- .unwrap_err()
- .into_inner();
+ let error = block_on_f01(coin.validate_fee(ValidateFeeArgs {
+ fee_tx: &dex_fee_tx,
+ expected_sender: &[],
+ fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
+ dex_fee: &DexFee::Standard(invalid_amount),
+ min_block_number: 0,
+ uuid: &[1; 16],
+ }))
+ .unwrap_err()
+ .into_inner();
println!("{}", error);
match error {
ValidatePaymentError::WrongPaymentTx(err) => assert!(err.contains("Invalid amount")),
@@ -3778,18 +3772,16 @@ pub mod tendermint_coin_tests {
let valid_amount: BigDecimal = "0.0001".parse().unwrap();
// valid amount but invalid sender
- let error = coin
- .validate_fee(ValidateFeeArgs {
- fee_tx: &dex_fee_tx,
- expected_sender: &DEX_FEE_ADDR_RAW_PUBKEY,
- fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
- dex_fee: &DexFee::Standard(valid_amount.clone().into()),
- min_block_number: 0,
- uuid: &[1; 16],
- })
- .wait()
- .unwrap_err()
- .into_inner();
+ let error = block_on_f01(coin.validate_fee(ValidateFeeArgs {
+ fee_tx: &dex_fee_tx,
+ expected_sender: &DEX_FEE_ADDR_RAW_PUBKEY,
+ fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
+ dex_fee: &DexFee::Standard(valid_amount.clone().into()),
+ min_block_number: 0,
+ uuid: &[1; 16],
+ }))
+ .unwrap_err()
+ .into_inner();
println!("{}", error);
match error {
ValidatePaymentError::WrongPaymentTx(err) => assert!(err.contains("Invalid sender")),
@@ -3797,18 +3789,16 @@ pub mod tendermint_coin_tests {
}
// invalid memo
- let error = coin
- .validate_fee(ValidateFeeArgs {
- fee_tx: &dex_fee_tx,
- expected_sender: &pubkey,
- fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
- dex_fee: &DexFee::Standard(valid_amount.into()),
- min_block_number: 0,
- uuid: &[1; 16],
- })
- .wait()
- .unwrap_err()
- .into_inner();
+ let error = block_on_f01(coin.validate_fee(ValidateFeeArgs {
+ fee_tx: &dex_fee_tx,
+ expected_sender: &pubkey,
+ fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
+ dex_fee: &DexFee::Standard(valid_amount.into()),
+ min_block_number: 0,
+ uuid: &[1; 16],
+ }))
+ .unwrap_err()
+ .into_inner();
println!("{}", error);
match error {
ValidatePaymentError::WrongPaymentTx(err) => assert!(err.contains("Invalid memo")),
diff --git a/mm2src/coins/utxo/pb.rs b/mm2src/coins/utxo/pb.rs
index 3ae572bc23..a9fb741a11 100644
--- a/mm2src/coins/utxo/pb.rs
+++ b/mm2src/coins/utxo/pb.rs
@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct GetMempoolInfoRequest {}
diff --git a/mm2src/coins/utxo/slp.rs b/mm2src/coins/utxo/slp.rs
index c559449c22..503611445e 100644
--- a/mm2src/coins/utxo/slp.rs
+++ b/mm2src/coins/utxo/slp.rs
@@ -1945,6 +1945,7 @@ mod slp_tests {
use crate::utxo::GetUtxoListOps;
use crate::{utxo::bch::tbch_coin_for_test, TransactionErr};
use common::block_on;
+ use common::block_on_f01;
use mocktopus::mocking::{MockResult, Mockable};
use std::mem::discriminant;
@@ -2206,11 +2207,11 @@ mod slp_tests {
];
let tx_bytes_str = hex::encode(tx_bytes);
- let err = fusd.send_raw_tx(&tx_bytes_str).wait().unwrap_err();
+ let err = block_on_f01(fusd.send_raw_tx(&tx_bytes_str)).unwrap_err();
println!("{:?}", err);
assert!(err.contains("is not valid with reason outputs greater than inputs"));
- let err2 = fusd.send_raw_tx_bytes(tx_bytes).wait().unwrap_err();
+ let err2 = block_on_f01(fusd.send_raw_tx_bytes(tx_bytes)).unwrap_err();
println!("{:?}", err2);
assert!(err2.contains("is not valid with reason outputs greater than inputs"));
assert_eq!(err, err2);
diff --git a/mm2src/coins/utxo/utxo_tests.rs b/mm2src/coins/utxo/utxo_tests.rs
index 868f558f1f..9456361c64 100644
--- a/mm2src/coins/utxo/utxo_tests.rs
+++ b/mm2src/coins/utxo/utxo_tests.rs
@@ -34,13 +34,12 @@ use crate::{BlockHeightAndTime, CoinBalance, ConfirmPaymentInput, DexFee, Iguana
use crate::{WaitForHTLCTxSpendArgs, WithdrawFee};
use chain::{BlockHeader, BlockHeaderBits, OutPoint};
use common::executor::Timer;
-use common::{block_on, wait_until_sec, OrdRange, PagingOptionsEnum, DEX_FEE_ADDR_RAW_PUBKEY};
+use common::{block_on, block_on_f01, wait_until_sec, OrdRange, PagingOptionsEnum, DEX_FEE_ADDR_RAW_PUBKEY};
use crypto::{privkey::key_pair_from_seed, Bip44Chain, HDPathToAccount, RpcDerivationPath, Secp256k1Secret};
#[cfg(not(target_arch = "wasm32"))]
use db_common::sqlite::rusqlite::Connection;
use futures::channel::mpsc::channel;
-use futures::future::join_all;
-use futures::TryFutureExt;
+use futures::future::{join_all, Either, FutureExt, TryFutureExt};
use keys::prefixes::*;
use mm2_core::mm_ctx::MmCtxBuilder;
use mm2_number::bigdecimal::{BigDecimal, Signed};
@@ -438,18 +437,16 @@ fn test_wait_for_payment_spend_timeout_native() {
let wait_until = now_sec() - 1;
let from_block = 1000;
- assert!(coin
- .wait_for_htlc_tx_spend(WaitForHTLCTxSpendArgs {
- tx_bytes: &transaction,
- secret_hash: &[],
- wait_until,
- from_block,
- swap_contract_address: &None,
- check_every: TAKER_PAYMENT_SPEND_SEARCH_INTERVAL,
- watcher_reward: false
- })
- .wait()
- .is_err());
+ assert!(block_on_f01(coin.wait_for_htlc_tx_spend(WaitForHTLCTxSpendArgs {
+ tx_bytes: &transaction,
+ secret_hash: &[],
+ wait_until,
+ from_block,
+ swap_contract_address: &None,
+ check_every: TAKER_PAYMENT_SPEND_SEARCH_INTERVAL,
+ watcher_reward: false
+ }))
+ .is_err());
assert!(unsafe { OUTPUT_SPEND_CALLED });
}
@@ -486,18 +483,16 @@ fn test_wait_for_payment_spend_timeout_electrum() {
let wait_until = now_sec() - 1;
let from_block = 1000;
- assert!(coin
- .wait_for_htlc_tx_spend(WaitForHTLCTxSpendArgs {
- tx_bytes: &transaction,
- secret_hash: &[],
- wait_until,
- from_block,
- swap_contract_address: &None,
- check_every: TAKER_PAYMENT_SPEND_SEARCH_INTERVAL,
- watcher_reward: false
- })
- .wait()
- .is_err());
+ assert!(block_on_f01(coin.wait_for_htlc_tx_spend(WaitForHTLCTxSpendArgs {
+ tx_bytes: &transaction,
+ secret_hash: &[],
+ wait_until,
+ from_block,
+ swap_contract_address: &None,
+ check_every: TAKER_PAYMENT_SPEND_SEARCH_INTERVAL,
+ watcher_reward: false
+ }))
+ .is_err());
assert!(unsafe { OUTPUT_SPEND_CALLED });
}
@@ -575,19 +570,22 @@ fn test_search_for_swap_tx_spend_electrum_was_refunded() {
#[cfg(not(target_arch = "wasm32"))]
fn test_withdraw_impl_set_fixed_fee() {
UtxoStandardCoin::get_unspent_ordered_list.mock_safe(|coin, _| {
- let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
- let unspents = vec![UnspentInfo {
- outpoint: OutPoint {
- hash: 1.into(),
- index: 0,
- },
- value: 1000000000,
- height: Default::default(),
- script: coin
- .script_for_address(&block_on(coin.as_ref().derivation_method.unwrap_single_addr()))
- .unwrap(),
- }];
- MockResult::Return(Box::pin(futures::future::ok((unspents, cache))))
+ let fut = async move {
+ let cache = coin.as_ref().recently_spent_outpoints.lock().await;
+ let unspents = vec![UnspentInfo {
+ outpoint: OutPoint {
+ hash: 1.into(),
+ index: 0,
+ },
+ value: 1000000000,
+ height: Default::default(),
+ script: coin
+ .script_for_address(&coin.as_ref().derivation_method.unwrap_single_addr().await)
+ .unwrap(),
+ }];
+ Ok((unspents, cache))
+ };
+ MockResult::Return(fut.boxed())
});
let client = NativeClient(Arc::new(NativeClientImpl::default()));
@@ -613,7 +611,7 @@ fn test_withdraw_impl_set_fixed_fee() {
}
.into(),
);
- let tx_details = coin.withdraw(withdraw_req).wait().unwrap();
+ let tx_details = block_on_f01(coin.withdraw(withdraw_req)).unwrap();
assert_eq!(expected, tx_details.fee_details);
}
@@ -621,19 +619,22 @@ fn test_withdraw_impl_set_fixed_fee() {
#[cfg(not(target_arch = "wasm32"))]
fn test_withdraw_impl_sat_per_kb_fee() {
UtxoStandardCoin::get_unspent_ordered_list.mock_safe(|coin, _| {
- let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
- let unspents = vec![UnspentInfo {
- outpoint: OutPoint {
- hash: 1.into(),
- index: 0,
- },
- value: 1000000000,
- height: Default::default(),
- script: coin
- .script_for_address(&block_on(coin.as_ref().derivation_method.unwrap_single_addr()))
- .unwrap(),
- }];
- MockResult::Return(Box::pin(futures::future::ok((unspents, cache))))
+ let fut = async move {
+ let cache = coin.as_ref().recently_spent_outpoints.lock().await;
+ let unspents = vec![UnspentInfo {
+ outpoint: OutPoint {
+ hash: 1.into(),
+ index: 0,
+ },
+ value: 1000000000,
+ height: Default::default(),
+ script: coin
+ .script_for_address(&coin.as_ref().derivation_method.unwrap_single_addr().await)
+ .unwrap(),
+ }];
+ Ok((unspents, cache))
+ };
+ MockResult::Return(fut.boxed())
});
let client = NativeClient(Arc::new(NativeClientImpl::default()));
@@ -662,7 +663,7 @@ fn test_withdraw_impl_sat_per_kb_fee() {
}
.into(),
);
- let tx_details = coin.withdraw(withdraw_req).wait().unwrap();
+ let tx_details = block_on_f01(coin.withdraw(withdraw_req)).unwrap();
assert_eq!(expected, tx_details.fee_details);
}
@@ -670,19 +671,22 @@ fn test_withdraw_impl_sat_per_kb_fee() {
#[cfg(not(target_arch = "wasm32"))]
fn test_withdraw_impl_sat_per_kb_fee_amount_equal_to_max() {
UtxoStandardCoin::get_unspent_ordered_list.mock_safe(|coin, _| {
- let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
- let unspents = vec![UnspentInfo {
- outpoint: OutPoint {
- hash: 1.into(),
- index: 0,
- },
- value: 1000000000,
- height: Default::default(),
- script: coin
- .script_for_address(&block_on(coin.as_ref().derivation_method.unwrap_single_addr()))
- .unwrap(),
- }];
- MockResult::Return(Box::pin(futures::future::ok((unspents, cache))))
+ let fut = async move {
+ let cache = coin.as_ref().recently_spent_outpoints.lock().await;
+ let unspents = vec![UnspentInfo {
+ outpoint: OutPoint {
+ hash: 1.into(),
+ index: 0,
+ },
+ value: 1000000000,
+ height: Default::default(),
+ script: coin
+ .script_for_address(&coin.as_ref().derivation_method.unwrap_single_addr().await)
+ .unwrap(),
+ }];
+ Ok((unspents, cache))
+ };
+ MockResult::Return(fut.boxed())
});
let client = NativeClient(Arc::new(NativeClientImpl::default()));
@@ -701,7 +705,7 @@ fn test_withdraw_impl_sat_per_kb_fee_amount_equal_to_max() {
memo: None,
ibc_source_channel: None,
};
- let tx_details = coin.withdraw(withdraw_req).wait().unwrap();
+ let tx_details = block_on_f01(coin.withdraw(withdraw_req)).unwrap();
// The resulting transaction size might be 210 or 211 bytes depending on signature size
// MM2 always expects the worst case during fee calculation
// 0.1 * 211 / 1000 = 0.0211
@@ -721,19 +725,22 @@ fn test_withdraw_impl_sat_per_kb_fee_amount_equal_to_max() {
#[cfg(not(target_arch = "wasm32"))]
fn test_withdraw_impl_sat_per_kb_fee_amount_equal_to_max_dust_included_to_fee() {
UtxoStandardCoin::get_unspent_ordered_list.mock_safe(|coin, _| {
- let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
- let unspents = vec![UnspentInfo {
- outpoint: OutPoint {
- hash: 1.into(),
- index: 0,
- },
- value: 1000000000,
- height: Default::default(),
- script: coin
- .script_for_address(&block_on(coin.as_ref().derivation_method.unwrap_single_addr()))
- .unwrap(),
- }];
- MockResult::Return(Box::pin(futures::future::ok((unspents, cache))))
+ let fut = async move {
+ let cache = coin.as_ref().recently_spent_outpoints.lock().await;
+ let unspents = vec![UnspentInfo {
+ outpoint: OutPoint {
+ hash: 1.into(),
+ index: 0,
+ },
+ value: 1000000000,
+ height: Default::default(),
+ script: coin
+ .script_for_address(&coin.as_ref().derivation_method.unwrap_single_addr().await)
+ .unwrap(),
+ }];
+ Ok((unspents, cache))
+ };
+ MockResult::Return(fut.boxed())
});
let client = NativeClient(Arc::new(NativeClientImpl::default()));
@@ -752,7 +759,7 @@ fn test_withdraw_impl_sat_per_kb_fee_amount_equal_to_max_dust_included_to_fee()
memo: None,
ibc_source_channel: None,
};
- let tx_details = coin.withdraw(withdraw_req).wait().unwrap();
+ let tx_details = block_on_f01(coin.withdraw(withdraw_req)).unwrap();
// The resulting transaction size might be 210 or 211 bytes depending on signature size
// MM2 always expects the worst case during fee calculation
// 0.1 * 211 / 1000 = 0.0211
@@ -772,19 +779,22 @@ fn test_withdraw_impl_sat_per_kb_fee_amount_equal_to_max_dust_included_to_fee()
#[cfg(not(target_arch = "wasm32"))]
fn test_withdraw_impl_sat_per_kb_fee_amount_over_max() {
UtxoStandardCoin::get_unspent_ordered_list.mock_safe(|coin, _| {
- let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
- let unspents = vec![UnspentInfo {
- outpoint: OutPoint {
- hash: 1.into(),
- index: 0,
- },
- value: 1000000000,
- height: Default::default(),
- script: coin
- .script_for_address(&block_on(coin.as_ref().derivation_method.unwrap_single_addr()))
- .unwrap(),
- }];
- MockResult::Return(Box::pin(futures::future::ok((unspents, cache))))
+ let fut = async move {
+ let cache = coin.as_ref().recently_spent_outpoints.lock().await;
+ let unspents = vec![UnspentInfo {
+ outpoint: OutPoint {
+ hash: 1.into(),
+ index: 0,
+ },
+ value: 1000000000,
+ height: Default::default(),
+ script: coin
+ .script_for_address(&coin.as_ref().derivation_method.unwrap_single_addr().await)
+ .unwrap(),
+ }];
+ Ok((unspents, cache))
+ };
+ MockResult::Return(fut.boxed())
});
let client = NativeClient(Arc::new(NativeClientImpl::default()));
@@ -803,26 +813,29 @@ fn test_withdraw_impl_sat_per_kb_fee_amount_over_max() {
memo: None,
ibc_source_channel: None,
};
- coin.withdraw(withdraw_req).wait().unwrap_err();
+ block_on_f01(coin.withdraw(withdraw_req)).unwrap_err();
}
#[test]
#[cfg(not(target_arch = "wasm32"))]
fn test_withdraw_impl_sat_per_kb_fee_max() {
UtxoStandardCoin::get_unspent_ordered_list.mock_safe(|coin, _| {
- let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
- let unspents = vec![UnspentInfo {
- outpoint: OutPoint {
- hash: 1.into(),
- index: 0,
- },
- value: 1000000000,
- height: Default::default(),
- script: coin
- .script_for_address(&block_on(coin.as_ref().derivation_method.unwrap_single_addr()))
- .unwrap(),
- }];
- MockResult::Return(Box::pin(futures::future::ok((unspents, cache))))
+ let fut = async move {
+ let cache = coin.as_ref().recently_spent_outpoints.lock().await;
+ let unspents = vec![UnspentInfo {
+ outpoint: OutPoint {
+ hash: 1.into(),
+ index: 0,
+ },
+ value: 1000000000,
+ height: Default::default(),
+ script: coin
+ .script_for_address(&coin.as_ref().derivation_method.unwrap_single_addr().await)
+ .unwrap(),
+ }];
+ Ok((unspents, cache))
+ };
+ MockResult::Return(fut.boxed())
});
let client = NativeClient(Arc::new(NativeClientImpl::default()));
@@ -851,7 +864,7 @@ fn test_withdraw_impl_sat_per_kb_fee_max() {
}
.into(),
);
- let tx_details = coin.withdraw(withdraw_req).wait().unwrap();
+ let tx_details = block_on_f01(coin.withdraw(withdraw_req)).unwrap();
assert_eq!(expected, tx_details.fee_details);
}
@@ -866,20 +879,23 @@ fn test_withdraw_kmd_rewards_impl(
let verbose: RpcTransaction = json::from_str(verbose_serialized).unwrap();
let unspent_height = verbose.height;
UtxoStandardCoin::get_unspent_ordered_list.mock_safe(move |coin: &UtxoStandardCoin, _| {
- let tx: UtxoTx = tx_hex.into();
- let unspents = vec![UnspentInfo {
- outpoint: OutPoint {
- hash: tx.hash(),
- index: 0,
- },
- value: tx.outputs[0].value,
- height: unspent_height,
- script: coin
- .script_for_address(&block_on(coin.as_ref().derivation_method.unwrap_single_addr()))
- .unwrap(),
- }];
- let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
- MockResult::Return(Box::pin(futures::future::ok((unspents, cache))))
+ let fut = async move {
+ let tx: UtxoTx = tx_hex.into();
+ let unspents = vec![UnspentInfo {
+ outpoint: OutPoint {
+ hash: tx.hash(),
+ index: 0,
+ },
+ value: tx.outputs[0].value,
+ height: unspent_height,
+ script: coin
+ .script_for_address(&coin.as_ref().derivation_method.unwrap_single_addr().await)
+ .unwrap(),
+ }];
+ let cache = coin.as_ref().recently_spent_outpoints.lock().await;
+ Ok((unspents, cache))
+ };
+ MockResult::Return(fut.boxed())
});
UtxoStandardCoin::get_current_mtp
.mock_safe(move |_fields| MockResult::Return(Box::pin(futures::future::ok(current_mtp))));
@@ -909,7 +925,7 @@ fn test_withdraw_kmd_rewards_impl(
coin: Some("KMD".into()),
amount: "0.00001".parse().unwrap(),
});
- let tx_details = coin.withdraw(withdraw_req).wait().unwrap();
+ let tx_details = block_on_f01(coin.withdraw(withdraw_req)).unwrap();
assert_eq!(tx_details.fee_details, Some(expected_fee));
let expected_rewards = expected_rewards.map(|amount| KmdRewardsDetails {
@@ -958,20 +974,23 @@ fn test_withdraw_rick_rewards_none() {
const TX_HEX: &str = "0400008085202f8901df8119c507aa61d32332cd246dbfeb3818a4f96e76492454c1fbba5aa097977e000000004847304402205a7e229ea6929c97fd6dde254c19e4eb890a90353249721701ae7a1c477d99c402206a8b7c5bf42b5095585731d6b4c589ce557f63c20aed69ff242eca22ecfcdc7a01feffffff02d04d1bffbc050000232102afdbba3e3c90db5f0f4064118f79cf308f926c68afd64ea7afc930975663e4c4ac402dd913000000001976a9143e17014eca06281ee600adffa34b4afb0922a22288ac2bdab86035a00e000000000000000000000000";
UtxoStandardCoin::get_unspent_ordered_list.mock_safe(move |coin, _| {
- let tx: UtxoTx = TX_HEX.into();
- let unspents = vec![UnspentInfo {
- outpoint: OutPoint {
- hash: tx.hash(),
- index: 0,
- },
- value: tx.outputs[0].value,
- height: Some(1431628),
- script: coin
- .script_for_address(&block_on(coin.as_ref().derivation_method.unwrap_single_addr()))
- .unwrap(),
- }];
- let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
- MockResult::Return(Box::pin(futures::future::ok((unspents, cache))))
+ let fut = async move {
+ let tx: UtxoTx = TX_HEX.into();
+ let unspents = vec![UnspentInfo {
+ outpoint: OutPoint {
+ hash: tx.hash(),
+ index: 0,
+ },
+ value: tx.outputs[0].value,
+ height: Some(1431628),
+ script: coin
+ .script_for_address(&coin.as_ref().derivation_method.unwrap_single_addr().await)
+ .unwrap(),
+ }];
+ let cache = coin.as_ref().recently_spent_outpoints.lock().await;
+ Ok((unspents, cache))
+ };
+ MockResult::Return(fut.boxed())
});
let withdraw_req = WithdrawRequest {
@@ -988,7 +1007,7 @@ fn test_withdraw_rick_rewards_none() {
coin: Some(TEST_COIN_NAME.into()),
amount: "0.00001".parse().unwrap(),
});
- let tx_details = coin.withdraw(withdraw_req).wait().unwrap();
+ let tx_details = block_on_f01(coin.withdraw(withdraw_req)).unwrap();
assert_eq!(tx_details.fee_details, Some(expected_fee));
assert_eq!(tx_details.kmd_rewards, None);
}
@@ -1066,7 +1085,7 @@ fn test_electrum_rpc_client_error() {
let client = electrum_client_for_test(&["electrum1.cipig.net:10060"]);
let empty_hash = H256Json::default();
- let err = client.get_verbose_transaction(&empty_hash).wait().unwrap_err();
+ let err = block_on_f01(client.get_verbose_transaction(&empty_hash)).unwrap_err();
// use the static string instead because the actual error message cannot be obtain
// by serde_json serialization
@@ -1305,10 +1324,7 @@ fn test_get_median_time_past_from_electrum_kmd() {
"electrum3.cipig.net:10001",
]);
- let mtp = client
- .get_median_time_past(1773390, KMD_MTP_BLOCK_COUNT, CoinVariant::Standard)
- .wait()
- .unwrap();
+ let mtp = block_on_f01(client.get_median_time_past(1773390, KMD_MTP_BLOCK_COUNT, CoinVariant::Standard)).unwrap();
// the MTP is block time of 1773385 in this case
assert_eq!(1583159915, mtp);
}
@@ -1321,10 +1337,7 @@ fn test_get_median_time_past_from_electrum_btc() {
"electrum3.cipig.net:10000",
]);
- let mtp = client
- .get_median_time_past(632858, KMD_MTP_BLOCK_COUNT, CoinVariant::Standard)
- .wait()
- .unwrap();
+ let mtp = block_on_f01(client.get_median_time_past(632858, KMD_MTP_BLOCK_COUNT, CoinVariant::Standard)).unwrap();
assert_eq!(1591173041, mtp);
}
@@ -1348,10 +1361,7 @@ fn test_get_median_time_past_from_native_has_median_in_get_block() {
)
});
- let mtp = client
- .get_median_time_past(632858, KMD_MTP_BLOCK_COUNT, CoinVariant::Standard)
- .wait()
- .unwrap();
+ let mtp = block_on_f01(client.get_median_time_past(632858, KMD_MTP_BLOCK_COUNT, CoinVariant::Standard)).unwrap();
assert_eq!(1591173041, mtp);
}
@@ -1394,10 +1404,7 @@ fn test_get_median_time_past_from_native_does_not_have_median_in_get_block() {
MockResult::Return(Box::new(futures01::future::ok(block)))
});
- let mtp = client
- .get_median_time_past(632858, KMD_MTP_BLOCK_COUNT, CoinVariant::Standard)
- .wait()
- .unwrap();
+ let mtp = block_on_f01(client.get_median_time_past(632858, KMD_MTP_BLOCK_COUNT, CoinVariant::Standard)).unwrap();
assert_eq!(1591173041, mtp);
}
@@ -1597,13 +1604,11 @@ fn test_spam_rick() {
fn test_one_unavailable_electrum_proto_version() {
// check if the electrum-mona.bitbank.cc:50001 doesn't support the protocol version 1.4
let client = electrum_client_for_test(&["electrum-mona.bitbank.cc:50001"]);
- let result = client
- .server_version(
- "electrum-mona.bitbank.cc:50001",
- "AtomicDEX",
- &OrdRange::new(1.4, 1.4).unwrap(),
- )
- .wait();
+ let result = block_on_f01(client.server_version(
+ "electrum-mona.bitbank.cc:50001",
+ "AtomicDEX",
+ &OrdRange::new(1.4, 1.4).unwrap(),
+ ));
assert!(result
.err()
.unwrap()
@@ -1628,7 +1633,7 @@ fn test_one_unavailable_electrum_proto_version() {
block_on(async { Timer::sleep(0.5).await });
- assert!(coin.as_ref().rpc_client.get_block_count().wait().is_ok());
+ assert!(block_on_f01(coin.as_ref().rpc_client.get_block_count()).is_ok());
}
#[test]
@@ -1685,7 +1690,7 @@ fn test_qtum_add_delegation() {
address: address.to_string(),
fee: Some(10),
};
- let res = coin.add_delegation(request).wait().unwrap();
+ let res = block_on_f01(coin.add_delegation(request)).unwrap();
// Eligible for delegation
assert!(res.my_balance_change.is_negative());
assert_eq!(res.total_amount, res.spent_by_me);
@@ -1695,7 +1700,7 @@ fn test_qtum_add_delegation() {
address: "fake_address".to_string(),
fee: Some(10),
};
- let res = coin.add_delegation(request).wait();
+ let res = block_on_f01(coin.add_delegation(request));
// Wrong address
assert!(res.is_err());
}
@@ -1728,7 +1733,7 @@ fn test_qtum_add_delegation_on_already_delegating() {
address: address.to_string(),
fee: Some(10),
};
- let res = coin.add_delegation(request).wait();
+ let res = block_on_f01(coin.add_delegation(request));
// Already Delegating
assert!(res.is_err());
}
@@ -1754,7 +1759,7 @@ fn test_qtum_get_delegation_infos() {
keypair.private().secret,
))
.unwrap();
- let staking_infos = coin.get_delegation_infos().wait().unwrap();
+ let staking_infos = block_on_f01(coin.get_delegation_infos()).unwrap();
match staking_infos.staking_infos_details {
StakingInfosDetails::Qtum(staking_details) => {
assert!(staking_details.am_i_staking);
@@ -1784,49 +1789,49 @@ fn test_qtum_remove_delegation() {
keypair.private().secret,
))
.unwrap();
- let res = coin.remove_delegation().wait();
+ let res = block_on_f01(coin.remove_delegation());
assert!(res.is_ok());
}
#[test]
fn test_qtum_my_balance() {
QtumCoin::get_mature_unspent_ordered_list.mock_safe(move |coin, _address| {
- let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
- // spendable balance (66.0)
- let mature = vec![
- UnspentInfo {
- outpoint: OutPoint {
- hash: 1.into(),
- index: 0,
+ let fut = async move {
+ let cache = coin.as_ref().recently_spent_outpoints.lock().await;
+ // spendable balance (66.0)
+ let mature = vec![
+ UnspentInfo {
+ outpoint: OutPoint {
+ hash: 1.into(),
+ index: 0,
+ },
+ value: 5000000000,
+ height: Default::default(),
+ script: Vec::new().into(),
},
- value: 5000000000,
- height: Default::default(),
- script: Vec::new().into(),
- },
- UnspentInfo {
+ UnspentInfo {
+ outpoint: OutPoint {
+ hash: 1.into(),
+ index: 0,
+ },
+ value: 1600000000,
+ height: Default::default(),
+ script: Vec::new().into(),
+ },
+ ];
+ // unspendable (2.0)
+ let immature = vec![UnspentInfo {
outpoint: OutPoint {
hash: 1.into(),
index: 0,
},
- value: 1600000000,
+ value: 200000000,
height: Default::default(),
script: Vec::new().into(),
- },
- ];
- // unspendable (2.0)
- let immature = vec![UnspentInfo {
- outpoint: OutPoint {
- hash: 1.into(),
- index: 0,
- },
- value: 200000000,
- height: Default::default(),
- script: Vec::new().into(),
- }];
- MockResult::Return(Box::pin(futures::future::ok((
- MatureUnspentList { mature, immature },
- cache,
- ))))
+ }];
+ Ok((MatureUnspentList { mature, immature }, cache))
+ };
+ MockResult::Return(fut.boxed())
});
let conf = json!({"coin":"tQTUM","rpcport":13889,"pubtype":120,"p2shtype":110});
@@ -1845,7 +1850,7 @@ fn test_qtum_my_balance() {
let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
let coin = block_on(qtum_coin_with_priv_key(&ctx, "tQTUM", &conf, ¶ms, priv_key)).unwrap();
- let CoinBalance { spendable, unspendable } = coin.my_balance().wait().unwrap();
+ let CoinBalance { spendable, unspendable } = block_on_f01(coin.my_balance()).unwrap();
let expected_spendable = BigDecimal::from(66);
let expected_unspendable = BigDecimal::from(2);
assert_eq!(spendable, expected_spendable);
@@ -1881,7 +1886,7 @@ fn test_qtum_my_balance_with_check_utxo_maturity_false() {
let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
let coin = block_on(qtum_coin_with_priv_key(&ctx, "tQTUM", &conf, ¶ms, priv_key)).unwrap();
- let CoinBalance { spendable, unspendable } = coin.my_balance().wait().unwrap();
+ let CoinBalance { spendable, unspendable } = block_on_f01(coin.my_balance()).unwrap();
let expected_spendable = BigDecimal::from(DISPLAY_BALANCE);
let expected_unspendable = BigDecimal::from(0);
assert_eq!(spendable, expected_spendable);
@@ -1899,7 +1904,7 @@ fn test_get_mature_unspent_ordered_map_from_cache_impl(
const TX_HASH: &str = "b43f9ed47f7b97d4766b6f1614136fa0c55b9a52c97342428333521fa13ad714";
let tx_hash: H256Json = hex::decode(TX_HASH).unwrap().as_slice().into();
let client = electrum_client_for_test(DOC_ELECTRUM_ADDRS);
- let mut verbose = client.get_verbose_transaction(&tx_hash).wait().unwrap();
+ let mut verbose = block_on_f01(client.get_verbose_transaction(&tx_hash)).unwrap();
verbose.confirmations = cached_confs;
verbose.height = cached_height;
@@ -2517,15 +2522,13 @@ fn test_find_output_spend_skips_conflicting_transactions() {
let tx: UtxoTx = "0400008085202f89027f57730fcbbc2c72fb18bcc3766a713044831a117bb1cade3ed88644864f7333020000006a47304402206e3737b2fcf078b61b16fa67340cc3e79c5d5e2dc9ffda09608371552a3887450220460a332aa1b8ad8f2de92d319666f70751078b221199951f80265b4f7cef8543012102d8c948c6af848c588517288168faa397d6ba3ea924596d03d1d84f224b5123c2ffffffff42b916a80430b80a77e114445b08cf120735447a524de10742fac8f6a9d4170f000000006a473044022004aa053edafb9d161ea8146e0c21ed1593aa6b9404dd44294bcdf920a1695fd902202365eac15dbcc5e9f83e2eed56a8f2f0e5aded36206f9c3fabc668fd4665fa2d012102d8c948c6af848c588517288168faa397d6ba3ea924596d03d1d84f224b5123c2ffffffff03547b16000000000017a9143e8ad0e2bf573d32cb0b3d3a304d9ebcd0c2023b870000000000000000166a144e2b3c0323ab3c2dc6f86dc5ec0729f11e42f56103970400000000001976a91450f4f098306f988d8843004689fae28c83ef16e888ac89c5925f000000000000000000000000000000".into();
let vout = 0;
let from_block = 0;
- let actual = client
- .find_output_spend(
- tx.hash(),
- &tx.outputs[vout].script_pubkey,
- vout,
- BlockHashOrHeight::Height(from_block),
- TxHashAlgo::DSHA256,
- )
- .wait();
+ let actual = block_on_f01(client.find_output_spend(
+ tx.hash(),
+ &tx.outputs[vout].script_pubkey,
+ vout,
+ BlockHashOrHeight::Height(from_block),
+ TxHashAlgo::DSHA256,
+ ));
assert_eq!(actual, Ok(None));
assert_eq!(unsafe { GET_RAW_TRANSACTION_BYTES_CALLED }, 1);
}
@@ -2609,7 +2612,7 @@ fn test_get_sender_trade_fee_dynamic_tx_fee() {
);
coin_fields.tx_fee = TxFee::Dynamic(EstimateFeeMethod::Standard);
let coin = utxo_coin_from_fields(coin_fields);
- let my_balance = coin.my_spendable_balance().wait().expect("!my_balance");
+ let my_balance = block_on_f01(coin.my_spendable_balance()).expect("!my_balance");
let expected_balance = BigDecimal::from_str("2.22222").expect("!BigDecimal::from_str");
assert_eq!(my_balance, expected_balance);
@@ -2657,7 +2660,9 @@ fn test_validate_fee_wrong_sender() {
min_block_number: 0,
uuid: &[],
};
- let error = coin.validate_fee(validate_fee_args).wait().unwrap_err().into_inner();
+ let error = block_on_f01(coin.validate_fee(validate_fee_args))
+ .unwrap_err()
+ .into_inner();
log!("error: {:?}", error);
match error {
ValidatePaymentError::WrongPaymentTx(err) => assert!(err.contains(INVALID_SENDER_ERR_LOG)),
@@ -2682,7 +2687,9 @@ fn test_validate_fee_min_block() {
min_block_number: 278455,
uuid: &[],
};
- let error = coin.validate_fee(validate_fee_args).wait().unwrap_err().into_inner();
+ let error = block_on_f01(coin.validate_fee(validate_fee_args))
+ .unwrap_err()
+ .into_inner();
match error {
ValidatePaymentError::WrongPaymentTx(err) => assert!(err.contains("confirmed before min_block")),
_ => panic!("Expected `WrongPaymentTx` early confirmation, found {:?}", error),
@@ -2711,7 +2718,7 @@ fn test_validate_fee_bch_70_bytes_signature() {
min_block_number: 0,
uuid: &[],
};
- coin.validate_fee(validate_fee_args).wait().unwrap();
+ block_on_f01(coin.validate_fee(validate_fee_args)).unwrap();
}
#[test]
@@ -2766,7 +2773,7 @@ fn firo_lelantus_tx() {
"electrumx02.firo.org:50001",
"electrumx03.firo.org:50001",
]);
- let _tx = electrum.get_verbose_transaction(&tx_hash).wait().unwrap();
+ let _tx = block_on_f01(electrum.get_verbose_transaction(&tx_hash)).unwrap();
}
#[test]
@@ -2903,9 +2910,7 @@ fn doge_mtp() {
"electrum2.cipig.net:10060",
"electrum3.cipig.net:10060",
]);
- let mtp = electrum
- .get_median_time_past(3631820, NonZeroU64::new(11).unwrap(), CoinVariant::Standard)
- .wait()
+ let mtp = block_on_f01(electrum.get_median_time_past(3631820, NonZeroU64::new(11).unwrap(), CoinVariant::Standard))
.unwrap();
assert_eq!(mtp, 1614849084);
}
@@ -2917,9 +2922,7 @@ fn firo_mtp() {
"electrumx02.firo.org:50001",
"electrumx03.firo.org:50001",
]);
- let mtp = electrum
- .get_median_time_past(356730, NonZeroU64::new(11).unwrap(), CoinVariant::Standard)
- .wait()
+ let mtp = block_on_f01(electrum.get_median_time_past(356730, NonZeroU64::new(11).unwrap(), CoinVariant::Standard))
.unwrap();
assert_eq!(mtp, 1616492629);
}
@@ -2927,9 +2930,7 @@ fn firo_mtp() {
#[test]
fn verus_mtp() {
let electrum = electrum_client_for_test(&["el0.verus.io:17485", "el1.verus.io:17485", "el2.verus.io:17485"]);
- let mtp = electrum
- .get_median_time_past(1480113, NonZeroU64::new(11).unwrap(), CoinVariant::Standard)
- .wait()
+ let mtp = block_on_f01(electrum.get_median_time_past(1480113, NonZeroU64::new(11).unwrap(), CoinVariant::Standard))
.unwrap();
assert_eq!(mtp, 1618579909);
}
@@ -2941,9 +2942,7 @@ fn sys_mtp() {
"electrum2.cipig.net:10064",
"electrum3.cipig.net:10064",
]);
- let mtp = electrum
- .get_median_time_past(1006678, NonZeroU64::new(11).unwrap(), CoinVariant::Standard)
- .wait()
+ let mtp = block_on_f01(electrum.get_median_time_past(1006678, NonZeroU64::new(11).unwrap(), CoinVariant::Standard))
.unwrap();
assert_eq!(mtp, 1620019628);
}
@@ -2955,9 +2954,7 @@ fn btc_mtp() {
"electrum2.cipig.net:10000",
"electrum3.cipig.net:10000",
]);
- let mtp = electrum
- .get_median_time_past(681659, NonZeroU64::new(11).unwrap(), CoinVariant::Standard)
- .wait()
+ let mtp = block_on_f01(electrum.get_median_time_past(681659, NonZeroU64::new(11).unwrap(), CoinVariant::Standard))
.unwrap();
assert_eq!(mtp, 1620019527);
}
@@ -2969,9 +2966,7 @@ fn rvn_mtp() {
"electrum2.cipig.net:10051",
"electrum3.cipig.net:10051",
]);
- let mtp = electrum
- .get_median_time_past(1968120, NonZeroU64::new(11).unwrap(), CoinVariant::Standard)
- .wait()
+ let mtp = block_on_f01(electrum.get_median_time_past(1968120, NonZeroU64::new(11).unwrap(), CoinVariant::Standard))
.unwrap();
assert_eq!(mtp, 1633946264);
}
@@ -2983,10 +2978,8 @@ fn qtum_mtp() {
"electrum2.cipig.net:10050",
"electrum3.cipig.net:10050",
]);
- let mtp = electrum
- .get_median_time_past(681659, NonZeroU64::new(11).unwrap(), CoinVariant::Qtum)
- .wait()
- .unwrap();
+ let mtp =
+ block_on_f01(electrum.get_median_time_past(681659, NonZeroU64::new(11).unwrap(), CoinVariant::Qtum)).unwrap();
assert_eq!(mtp, 1598854128);
}
@@ -2997,9 +2990,7 @@ fn zer_mtp() {
"electrum2.cipig.net:10065",
"electrum3.cipig.net:10065",
]);
- let mtp = electrum
- .get_median_time_past(1130915, NonZeroU64::new(11).unwrap(), CoinVariant::Standard)
- .wait()
+ let mtp = block_on_f01(electrum.get_median_time_past(1130915, NonZeroU64::new(11).unwrap(), CoinVariant::Standard))
.unwrap();
assert_eq!(mtp, 1623240214);
}
@@ -3196,7 +3187,7 @@ fn test_withdraw_to_p2pk_fails() {
};
assert!(matches!(
- coin.withdraw(withdraw_req).wait().unwrap_err().into_inner(),
+ block_on_f01(coin.withdraw(withdraw_req)).unwrap_err().into_inner(),
WithdrawError::InvalidAddress(..)
))
}
@@ -3209,19 +3200,22 @@ fn test_withdraw_to_p2pkh() {
let coin = utxo_coin_for_test(UtxoRpcClientEnum::Native(client), None, false);
UtxoStandardCoin::get_unspent_ordered_list.mock_safe(|coin, _| {
- let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
- let unspents = vec![UnspentInfo {
- outpoint: OutPoint {
- hash: 1.into(),
- index: 0,
- },
- value: 1000000000,
- height: Default::default(),
- script: coin
- .script_for_address(&block_on(coin.as_ref().derivation_method.unwrap_single_addr()))
- .unwrap(),
- }];
- MockResult::Return(Box::pin(futures::future::ok((unspents, cache))))
+ let fut = async move {
+ let cache = coin.as_ref().recently_spent_outpoints.lock().await;
+ let unspents = vec![UnspentInfo {
+ outpoint: OutPoint {
+ hash: 1.into(),
+ index: 0,
+ },
+ value: 1000000000,
+ height: Default::default(),
+ script: coin
+ .script_for_address(&coin.as_ref().derivation_method.unwrap_single_addr().await)
+ .unwrap(),
+ }];
+ Ok((unspents, cache))
+ };
+ MockResult::Return(fut.boxed())
});
// Create a p2pkh address for the test coin
@@ -3249,7 +3243,7 @@ fn test_withdraw_to_p2pkh() {
memo: None,
ibc_source_channel: None,
};
- let tx_details = coin.withdraw(withdraw_req).wait().unwrap();
+ let tx_details = block_on_f01(coin.withdraw(withdraw_req)).unwrap();
let transaction: UtxoTx = deserialize(tx_details.tx.tx_hex().unwrap().as_slice()).unwrap();
let output_script: Script = transaction.outputs[0].script_pubkey.clone().into();
@@ -3266,19 +3260,22 @@ fn test_withdraw_to_p2sh() {
let coin = utxo_coin_for_test(UtxoRpcClientEnum::Native(client), None, false);
UtxoStandardCoin::get_unspent_ordered_list.mock_safe(|coin, _| {
- let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
- let unspents = vec![UnspentInfo {
- outpoint: OutPoint {
- hash: 1.into(),
- index: 0,
- },
- value: 1000000000,
- height: Default::default(),
- script: coin
- .script_for_address(&block_on(coin.as_ref().derivation_method.unwrap_single_addr()))
- .unwrap(),
- }];
- MockResult::Return(Box::pin(futures::future::ok((unspents, cache))))
+ let fut = async move {
+ let cache = coin.as_ref().recently_spent_outpoints.lock().await;
+ let unspents = vec![UnspentInfo {
+ outpoint: OutPoint {
+ hash: 1.into(),
+ index: 0,
+ },
+ value: 1000000000,
+ height: Default::default(),
+ script: coin
+ .script_for_address(&coin.as_ref().derivation_method.unwrap_single_addr().await)
+ .unwrap(),
+ }];
+ Ok((unspents, cache))
+ };
+ MockResult::Return(fut.boxed())
});
// Create a p2sh address for the test coin
@@ -3306,7 +3303,7 @@ fn test_withdraw_to_p2sh() {
memo: None,
ibc_source_channel: None,
};
- let tx_details = coin.withdraw(withdraw_req).wait().unwrap();
+ let tx_details = block_on_f01(coin.withdraw(withdraw_req)).unwrap();
let transaction: UtxoTx = deserialize(tx_details.tx.tx_hex().unwrap().as_slice()).unwrap();
let output_script: Script = transaction.outputs[0].script_pubkey.clone().into();
@@ -3323,19 +3320,22 @@ fn test_withdraw_to_p2wpkh() {
let coin = utxo_coin_for_test(UtxoRpcClientEnum::Native(client), None, true);
UtxoStandardCoin::get_unspent_ordered_list.mock_safe(|coin, _| {
- let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
- let unspents = vec![UnspentInfo {
- outpoint: OutPoint {
- hash: 1.into(),
- index: 0,
- },
- value: 1000000000,
- height: Default::default(),
- script: coin
- .script_for_address(&block_on(coin.as_ref().derivation_method.unwrap_single_addr()))
- .unwrap(),
- }];
- MockResult::Return(Box::pin(futures::future::ok((unspents, cache))))
+ let fut = async move {
+ let cache = coin.as_ref().recently_spent_outpoints.lock().await;
+ let unspents = vec![UnspentInfo {
+ outpoint: OutPoint {
+ hash: 1.into(),
+ index: 0,
+ },
+ value: 1000000000,
+ height: Default::default(),
+ script: coin
+ .script_for_address(&coin.as_ref().derivation_method.unwrap_single_addr().await)
+ .unwrap(),
+ }];
+ Ok((unspents, cache))
+ };
+ MockResult::Return(fut.boxed())
});
// Create a p2wpkh address for the test coin
@@ -3363,7 +3363,7 @@ fn test_withdraw_to_p2wpkh() {
memo: None,
ibc_source_channel: None,
};
- let tx_details = coin.withdraw(withdraw_req).wait().unwrap();
+ let tx_details = block_on_f01(coin.withdraw(withdraw_req)).unwrap();
let transaction: UtxoTx = deserialize(tx_details.tx.tx_hex().unwrap().as_slice()).unwrap();
let output_script: Script = transaction.outputs[0].script_pubkey.clone().into();
@@ -3380,22 +3380,29 @@ fn test_withdraw_p2pk_balance() {
let coin = utxo_coin_for_test(UtxoRpcClientEnum::Native(client), None, false);
UtxoStandardCoin::get_unspent_ordered_list.mock_safe(|coin, _| {
- let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
- let unspents = vec![UnspentInfo {
- outpoint: OutPoint {
- hash: 1.into(),
- index: 0,
- },
- value: 1000000000,
- height: Default::default(),
- // Use a p2pk output script for this UTXO
- script: output_script_p2pk(
- &block_on(coin.as_ref().derivation_method.unwrap_single_addr())
- .pubkey()
- .unwrap(),
- ),
- }];
- MockResult::Return(Box::pin(futures::future::ok((unspents, cache))))
+ let fut = async move {
+ let cache = coin.as_ref().recently_spent_outpoints.lock().await;
+ let unspents = vec![UnspentInfo {
+ outpoint: OutPoint {
+ hash: 1.into(),
+ index: 0,
+ },
+ value: 1000000000,
+ height: Default::default(),
+ // Use a p2pk output script for this UTXO
+ script: output_script_p2pk(
+ &coin
+ .as_ref()
+ .derivation_method
+ .unwrap_single_addr()
+ .await
+ .pubkey()
+ .unwrap(),
+ ),
+ }];
+ Ok((unspents, cache))
+ };
+ MockResult::Return(fut.boxed())
});
// Create a dummy p2pkh address to withdraw the coins to.
@@ -3411,7 +3418,7 @@ fn test_withdraw_p2pk_balance() {
memo: None,
ibc_source_channel: None,
};
- let tx_details = coin.withdraw(withdraw_req).wait().unwrap();
+ let tx_details = block_on_f01(coin.withdraw(withdraw_req)).unwrap();
let transaction: UtxoTx = deserialize(tx_details.tx.tx_hex().unwrap().as_slice()).unwrap();
// The change should be in a p2pkh script.
@@ -3432,8 +3439,11 @@ fn test_utxo_standard_with_check_utxo_maturity_true() {
UtxoStandardCoin::get_mature_unspent_ordered_list.mock_safe(|coin, _| {
unsafe { GET_MATURE_UNSPENT_ORDERED_LIST_CALLED = true };
- let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
- MockResult::Return(Box::pin(futures::future::ok((MatureUnspentList::default(), cache))))
+ let fut = async move {
+ let cache = coin.as_ref().recently_spent_outpoints.lock().await;
+ Ok((MatureUnspentList::default(), cache))
+ };
+ MockResult::Return(fut.boxed())
});
let conf = json!({"coin":"RICK","asset":"RICK","rpcport":25435,"txversion":4,"overwintered":1,"mm2":1,"protocol":{"type":"UTXO"}});
@@ -3451,7 +3461,7 @@ fn test_utxo_standard_with_check_utxo_maturity_true() {
let address = Address::from_legacyaddress("R9o9xTocqr6CeEDGDH6mEYpwLoMz6jNjMW", &KMD_PREFIXES).unwrap();
// Don't use `block_on` here because it's used within a mock of [`GetUtxoListOps::get_mature_unspent_ordered_list`].
- coin.get_unspent_ordered_list(&address).compat().wait().unwrap();
+ block_on_f01(coin.get_unspent_ordered_list(&address).compat()).unwrap();
assert!(unsafe { GET_MATURE_UNSPENT_ORDERED_LIST_CALLED });
}
@@ -3464,9 +3474,11 @@ fn test_utxo_standard_without_check_utxo_maturity() {
UtxoStandardCoin::get_all_unspent_ordered_list.mock_safe(|coin, _| {
unsafe { GET_ALL_UNSPENT_ORDERED_LIST_CALLED = true };
- let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
- let unspents = Vec::new();
- MockResult::Return(Box::pin(futures::future::ok((unspents, cache))))
+ let fut = async move {
+ let cache = coin.as_ref().recently_spent_outpoints.lock().await;
+ Ok((Vec::new(), cache))
+ };
+ MockResult::Return(fut.boxed())
});
UtxoStandardCoin::get_mature_unspent_ordered_list.mock_safe(|_, _| {
@@ -3487,7 +3499,7 @@ fn test_utxo_standard_without_check_utxo_maturity() {
let address = Address::from_legacyaddress("R9o9xTocqr6CeEDGDH6mEYpwLoMz6jNjMW", &KMD_PREFIXES).unwrap();
// Don't use `block_on` here because it's used within a mock of [`UtxoStandardCoin::get_all_unspent_ordered_list`].
- coin.get_unspent_ordered_list(&address).compat().wait().unwrap();
+ block_on_f01(coin.get_unspent_ordered_list(&address).compat()).unwrap();
assert!(unsafe { GET_ALL_UNSPENT_ORDERED_LIST_CALLED });
}
@@ -3500,8 +3512,11 @@ fn test_qtum_without_check_utxo_maturity() {
QtumCoin::get_mature_unspent_ordered_list.mock_safe(|coin, _| {
unsafe { GET_MATURE_UNSPENT_ORDERED_LIST_CALLED = true };
- let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
- MockResult::Return(Box::pin(futures::future::ok((MatureUnspentList::default(), cache))))
+ let fut = async move {
+ let cache = coin.as_ref().recently_spent_outpoints.lock().await;
+ Ok((MatureUnspentList::default(), cache))
+ };
+ MockResult::Return(fut.boxed())
});
let conf = json!({"coin":"tQTUM","rpcport":13889,"pubtype":120,"p2shtype":110});
@@ -3526,7 +3541,7 @@ fn test_qtum_without_check_utxo_maturity() {
)
.unwrap();
// Don't use `block_on` here because it's used within a mock of [`QtumCoin::get_mature_unspent_ordered_list`].
- coin.get_unspent_ordered_list(&address).compat().wait().unwrap();
+ block_on_f01(coin.get_unspent_ordered_list(&address).compat()).unwrap();
assert!(unsafe { GET_MATURE_UNSPENT_ORDERED_LIST_CALLED });
}
@@ -3604,9 +3619,12 @@ fn test_qtum_with_check_utxo_maturity_false() {
QtumCoin::get_all_unspent_ordered_list.mock_safe(|coin, _address| {
unsafe { GET_ALL_UNSPENT_ORDERED_LIST_CALLED = true };
- let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
- let unspents = Vec::new();
- MockResult::Return(Box::pin(futures::future::ok((unspents, cache))))
+ let fut = async move {
+ let cache = coin.as_ref().recently_spent_outpoints.lock().await;
+ let unspents = Vec::new();
+ Ok((unspents, cache))
+ };
+ MockResult::Return(fut.boxed())
});
QtumCoin::get_mature_unspent_ordered_list.mock_safe(|_, _| {
panic!(
@@ -3637,7 +3655,7 @@ fn test_qtum_with_check_utxo_maturity_false() {
)
.unwrap();
// Don't use `block_on` here because it's used within a mock of [`QtumCoin::get_all_unspent_ordered_list`].
- coin.get_unspent_ordered_list(&address).compat().wait().unwrap();
+ block_on_f01(coin.get_unspent_ordered_list(&address).compat()).unwrap();
assert!(unsafe { GET_ALL_UNSPENT_ORDERED_LIST_CALLED });
}
@@ -4365,7 +4383,9 @@ fn test_for_non_existent_tx_hex_utxo_electrum() {
wait_until: timeout,
check_every: 1,
};
- let actual = coin.wait_for_confirmations(confirm_payment_input).wait().err().unwrap();
+ let actual = block_on_f01(coin.wait_for_confirmations(confirm_payment_input))
+ .err()
+ .unwrap();
assert!(actual.contains(
"Tx d342ff9da528a2e262bddf2b6f9a27d1beb7aeb03f0fc8d9eac2987266447e44 was not found on chain after 10 tries"
));
@@ -4408,10 +4428,7 @@ fn test_native_display_balances() {
Address::from_legacyaddress("RJeDDtDRtKUoL8BCKdH7TNCHqUKr7kQRsi", &KMD_PREFIXES).unwrap(),
Address::from_legacyaddress("RQHn9VPHBqNjYwyKfJbZCiaxVrWPKGQjeF", &KMD_PREFIXES).unwrap(),
];
- let actual = rpc_client
- .display_balances(addresses, TEST_COIN_DECIMALS)
- .wait()
- .unwrap();
+ let actual = block_on_f01(rpc_client.display_balances(addresses, TEST_COIN_DECIMALS)).unwrap();
let expected: Vec<(Address, BigDecimal)> = vec![
(
@@ -4549,7 +4566,6 @@ fn test_utxo_validate_valid_and_invalid_pubkey() {
#[test]
fn test_block_header_utxo_loop() {
use crate::utxo::utxo_builder::{block_header_utxo_loop, BlockHeaderUtxoLoopExtraArgs};
- use futures::future::{Either, FutureExt};
use keys::hash::H256 as H256Json;
static mut CURRENT_BLOCK_COUNT: u64 = 13;
diff --git a/mm2src/coins/z_coin/storage/walletdb/wasm/mod.rs b/mm2src/coins/z_coin/storage/walletdb/wasm/mod.rs
index 907a007c55..4c68fec22c 100644
--- a/mm2src/coins/z_coin/storage/walletdb/wasm/mod.rs
+++ b/mm2src/coins/z_coin/storage/walletdb/wasm/mod.rs
@@ -253,7 +253,12 @@ mod wasm_test {
// scan the cache
let scan = DataConnStmtCacheWrapper::new(DataConnStmtCacheWasm(walletdb.clone()));
blockdb
- .process_blocks_with_mode(consensus_params.clone(), BlockProcessingMode::Scan(scan), None, None)
+ .process_blocks_with_mode(
+ consensus_params.clone(),
+ BlockProcessingMode::Scan(scan, None),
+ None,
+ None,
+ )
.await
.unwrap();
@@ -293,7 +298,12 @@ mod wasm_test {
// Scan the cache again
let scan = DataConnStmtCacheWrapper::new(DataConnStmtCacheWasm(walletdb.clone()));
blockdb
- .process_blocks_with_mode(consensus_params.clone(), BlockProcessingMode::Scan(scan), None, None)
+ .process_blocks_with_mode(
+ consensus_params.clone(),
+ BlockProcessingMode::Scan(scan, None),
+ None,
+ None,
+ )
.await
.unwrap();
@@ -347,7 +357,12 @@ mod wasm_test {
// Scan the cache again
let scan = DataConnStmtCacheWrapper::new(DataConnStmtCacheWasm(walletdb.clone()));
blockdb
- .process_blocks_with_mode(consensus_params.clone(), BlockProcessingMode::Scan(scan), None, None)
+ .process_blocks_with_mode(
+ consensus_params.clone(),
+ BlockProcessingMode::Scan(scan, None),
+ None,
+ None,
+ )
.await
.unwrap();
@@ -436,7 +451,12 @@ mod wasm_test {
// Scan the cache again
let scan = DataConnStmtCacheWrapper::new(DataConnStmtCacheWasm(walletdb.clone()));
blockdb
- .process_blocks_with_mode(consensus_params.clone(), BlockProcessingMode::Scan(scan), None, None)
+ .process_blocks_with_mode(
+ consensus_params.clone(),
+ BlockProcessingMode::Scan(scan, None),
+ None,
+ None,
+ )
.await
.unwrap();
@@ -520,7 +540,12 @@ mod wasm_test {
// Scan the cache
let scan = DataConnStmtCacheWrapper::new(DataConnStmtCacheWasm(walletdb.clone()));
blockdb
- .process_blocks_with_mode(consensus_params.clone(), BlockProcessingMode::Scan(scan), None, None)
+ .process_blocks_with_mode(
+ consensus_params.clone(),
+ BlockProcessingMode::Scan(scan, None),
+ None,
+ None,
+ )
.await
.unwrap();
@@ -545,7 +570,12 @@ mod wasm_test {
// Scan the cache again
let scan = DataConnStmtCacheWrapper::new(DataConnStmtCacheWasm(walletdb.clone()));
blockdb
- .process_blocks_with_mode(consensus_params.clone(), BlockProcessingMode::Scan(scan), None, None)
+ .process_blocks_with_mode(
+ consensus_params.clone(),
+ BlockProcessingMode::Scan(scan, None),
+ None,
+ None,
+ )
.await
.unwrap();
@@ -579,7 +609,12 @@ mod wasm_test {
// Scan cache
let scan = DataConnStmtCacheWrapper::new(DataConnStmtCacheWasm(walletdb.clone()));
blockdb
- .process_blocks_with_mode(consensus_params.clone(), BlockProcessingMode::Scan(scan), None, None)
+ .process_blocks_with_mode(
+ consensus_params.clone(),
+ BlockProcessingMode::Scan(scan, None),
+ None,
+ None,
+ )
.await
.unwrap();
@@ -592,7 +627,12 @@ mod wasm_test {
// Scan the cache again
let scan = DataConnStmtCacheWrapper::new(DataConnStmtCacheWasm(walletdb.clone()));
let scan = blockdb
- .process_blocks_with_mode(consensus_params.clone(), BlockProcessingMode::Scan(scan), None, None)
+ .process_blocks_with_mode(
+ consensus_params.clone(),
+ BlockProcessingMode::Scan(scan, None),
+ None,
+ None,
+ )
.await
.unwrap_err();
match scan.get_inner() {
@@ -611,7 +651,12 @@ mod wasm_test {
blockdb.insert_block(cb2.height as u32, cb2_bytes).await.unwrap();
let scan = DataConnStmtCacheWrapper::new(DataConnStmtCacheWasm(walletdb.clone()));
assert!(blockdb
- .process_blocks_with_mode(consensus_params.clone(), BlockProcessingMode::Scan(scan), None, None)
+ .process_blocks_with_mode(
+ consensus_params.clone(),
+ BlockProcessingMode::Scan(scan, None),
+ None,
+ None
+ )
.await
.is_ok());
@@ -650,7 +695,12 @@ mod wasm_test {
// Scan the cache
let scan = DataConnStmtCacheWrapper::new(DataConnStmtCacheWasm(walletdb.clone()));
assert!(blockdb
- .process_blocks_with_mode(consensus_params.clone(), BlockProcessingMode::Scan(scan), None, None)
+ .process_blocks_with_mode(
+ consensus_params.clone(),
+ BlockProcessingMode::Scan(scan, None),
+ None,
+ None
+ )
.await
.is_ok());
@@ -666,7 +716,12 @@ mod wasm_test {
// Scan the cache again
let scan = DataConnStmtCacheWrapper::new(DataConnStmtCacheWasm(walletdb.clone()));
assert!(blockdb
- .process_blocks_with_mode(consensus_params.clone(), BlockProcessingMode::Scan(scan), None, None)
+ .process_blocks_with_mode(
+ consensus_params.clone(),
+ BlockProcessingMode::Scan(scan, None),
+ None,
+ None
+ )
.await
.is_ok());
@@ -703,7 +758,12 @@ mod wasm_test {
// Scan the cache
let scan = DataConnStmtCacheWrapper::new(DataConnStmtCacheWasm(walletdb.clone()));
assert!(blockdb
- .process_blocks_with_mode(consensus_params.clone(), BlockProcessingMode::Scan(scan), None, None)
+ .process_blocks_with_mode(
+ consensus_params.clone(),
+ BlockProcessingMode::Scan(scan, None),
+ None,
+ None
+ )
.await
.is_ok());
@@ -728,7 +788,12 @@ mod wasm_test {
// Scan the cache again
let scan = DataConnStmtCacheWrapper::new(DataConnStmtCacheWasm(walletdb.clone()));
let scan = blockdb
- .process_blocks_with_mode(consensus_params.clone(), BlockProcessingMode::Scan(scan), None, None)
+ .process_blocks_with_mode(
+ consensus_params.clone(),
+ BlockProcessingMode::Scan(scan, None),
+ None,
+ None,
+ )
.await;
assert!(scan.is_ok());
@@ -767,7 +832,7 @@ mod wasm_test {
// // Scan the cache
// let scan = DataConnStmtCacheWrapper::new(DataConnStmtCacheWasm(walletdb.clone()));
// assert!(blockdb
- // .process_blocks_with_mode(consensus_params.clone(), BlockProcessingMode::Scan(scan), None, None)
+ // .process_blocks_with_mode(consensus_params.clone(), BlockProcessingMode::Scan(scan, None), None, None)
// .await
// .is_ok());
//
@@ -787,7 +852,7 @@ mod wasm_test {
// // Scan the cache
// let scan = DataConnStmtCacheWrapper::new(DataConnStmtCacheWasm(walletdb.clone()));
// assert!(blockdb
- // .process_blocks_with_mode(consensus_params.clone(), BlockProcessingMode::Scan(scan), None, None)
+ // .process_blocks_with_mode(consensus_params.clone(), BlockProcessingMode::Scan(scan, None), None, None)
// .await
// .is_ok());
//
@@ -832,7 +897,7 @@ mod wasm_test {
// // Scan the cache
// let scan = DataConnStmtCacheWrapper::new(DataConnStmtCacheWasm(walletdb.clone()));
// assert!(blockdb
- // .process_blocks_with_mode(consensus_params.clone(), BlockProcessingMode::Scan(scan), None, None)
+ // .process_blocks_with_mode(consensus_params.clone(), BlockProcessingMode::Scan(scan, None), None, None)
// .await
// .is_ok());
//
@@ -863,7 +928,7 @@ mod wasm_test {
// // Scan the cache
// let scan = DataConnStmtCacheWrapper::new(DataConnStmtCacheWasm(walletdb.clone()));
// assert!(blockdb
- // .process_blocks_with_mode(consensus_params.clone(), BlockProcessingMode::Scan(scan), None, None)
+ // .process_blocks_with_mode(consensus_params.clone(), BlockProcessingMode::Scan(scan, None), None, None)
// .await
// .is_ok());
//
@@ -1033,7 +1098,7 @@ mod wasm_test {
// // Scan the cache
// let scan = DataConnStmtCacheWrapper::new(DataConnStmtCacheWasm(walletdb.clone()));
// blockdb
- // .process_blocks_with_mode(consensus_params.clone(), BlockProcessingMode::Scan(scan), None, None)
+ // .process_blocks_with_mode(consensus_params.clone(), BlockProcessingMode::Scan(scan, None), None, None)
// .await
// .unwrap();
// assert_eq!(walletdb.get_balance(AccountId(0)).await.unwrap(), value);
@@ -1090,7 +1155,7 @@ mod wasm_test {
// // Scan the cache
// let scan = DataConnStmtCacheWrapper::new(DataConnStmtCacheWasm(walletdb.clone()));
// blockdb
- // .process_blocks_with_mode(consensus_params.clone(), BlockProcessingMode::Scan(scan), None, None)
+ // .process_blocks_with_mode(consensus_params.clone(), BlockProcessingMode::Scan(scan, None), None, None)
// .await
// .unwrap();
//
@@ -1126,7 +1191,7 @@ mod wasm_test {
// // Scan the cache
// let scan = DataConnStmtCacheWrapper::new(DataConnStmtCacheWasm(walletdb.clone()));
// blockdb
- // .process_blocks_with_mode(consensus_params.clone(), BlockProcessingMode::Scan(scan), None, None)
+ // .process_blocks_with_mode(consensus_params.clone(), BlockProcessingMode::Scan(scan, None), None, None)
// .await
// .unwrap();
//
diff --git a/mm2src/coins/z_coin/z_coin_native_tests.rs b/mm2src/coins/z_coin/z_coin_native_tests.rs
index 9e4358727d..790f42818f 100644
--- a/mm2src/coins/z_coin/z_coin_native_tests.rs
+++ b/mm2src/coins/z_coin/z_coin_native_tests.rs
@@ -1,14 +1,13 @@
use bitcrypto::dhash160;
-use common::{block_on, now_sec};
+use common::{block_on, block_on_f01, now_sec};
use mm2_core::mm_ctx::MmCtxBuilder;
use mm2_test_helpers::for_tests::zombie_conf;
use std::path::PathBuf;
use std::time::Duration;
use zcash_client_backend::encoding::decode_extended_spending_key;
-use super::{z_coin_from_conf_and_params_with_z_key, z_mainnet_constants, Future, PrivKeyBuildPolicy,
- RefundPaymentArgs, SendPaymentArgs, SpendPaymentArgs, SwapOps, ValidateFeeArgs, ValidatePaymentError,
- ZTransaction};
+use super::{z_coin_from_conf_and_params_with_z_key, z_mainnet_constants, PrivKeyBuildPolicy, RefundPaymentArgs,
+ SendPaymentArgs, SpendPaymentArgs, SwapOps, ValidateFeeArgs, ValidatePaymentError, ZTransaction};
use crate::z_coin::{z_htlc::z_send_dex_fee, ZcoinActivationParams, ZcoinRpcMode};
use crate::DexFee;
use crate::{CoinProtocol, SwapTxTypeWithSecretHash};
@@ -55,7 +54,7 @@ fn zombie_coin_send_and_refund_maker_payment() {
watcher_reward: None,
wait_for_confirmation_until: 0,
};
- let tx = coin.send_maker_payment(args).wait().unwrap();
+ let tx = block_on_f01(coin.send_maker_payment(args)).unwrap();
log!("swap tx {}", hex::encode(tx.tx_hash_as_bytes().0));
let refund_args = RefundPaymentArgs {
@@ -116,7 +115,7 @@ fn zombie_coin_send_and_spend_maker_payment() {
wait_for_confirmation_until: 0,
};
- let tx = coin.send_maker_payment(maker_payment_args).wait().unwrap();
+ let tx = block_on_f01(coin.send_maker_payment(maker_payment_args)).unwrap();
log!("swap tx {}", hex::encode(tx.tx_hash_as_bytes().0));
let maker_pub = taker_pub;
@@ -234,7 +233,9 @@ fn zombie_coin_validate_dex_fee() {
uuid: &[1; 16],
};
// Invalid amount should return an error
- let err = coin.validate_fee(validate_fee_args).wait().unwrap_err().into_inner();
+ let err = block_on_f01(coin.validate_fee(validate_fee_args))
+ .unwrap_err()
+ .into_inner();
match err {
ValidatePaymentError::WrongPaymentTx(err) => assert!(err.contains("Dex fee has invalid amount")),
_ => panic!("Expected `WrongPaymentTx`: {:?}", err),
@@ -249,7 +250,9 @@ fn zombie_coin_validate_dex_fee() {
min_block_number: 12000,
uuid: &[2; 16],
};
- let err = coin.validate_fee(validate_fee_args).wait().unwrap_err().into_inner();
+ let err = block_on_f01(coin.validate_fee(validate_fee_args))
+ .unwrap_err()
+ .into_inner();
match err {
ValidatePaymentError::WrongPaymentTx(err) => assert!(err.contains("Dex fee has invalid memo")),
_ => panic!("Expected `WrongPaymentTx`: {:?}", err),
@@ -264,7 +267,9 @@ fn zombie_coin_validate_dex_fee() {
min_block_number: 14000,
uuid: &[1; 16],
};
- let err = coin.validate_fee(validate_fee_args).wait().unwrap_err().into_inner();
+ let err = block_on_f01(coin.validate_fee(validate_fee_args))
+ .unwrap_err()
+ .into_inner();
match err {
ValidatePaymentError::WrongPaymentTx(err) => assert!(err.contains("confirmed before min block")),
_ => panic!("Expected `WrongPaymentTx`: {:?}", err),
@@ -279,7 +284,7 @@ fn zombie_coin_validate_dex_fee() {
min_block_number: 12000,
uuid: &[1; 16],
};
- coin.validate_fee(validate_fee_args).wait().unwrap();
+ block_on_f01(coin.validate_fee(validate_fee_args)).unwrap();
}
fn default_zcoin_activation_params() -> ZcoinActivationParams {
diff --git a/mm2src/coins_activation/Cargo.toml b/mm2src/coins_activation/Cargo.toml
index aef4b9b557..be951c67d4 100644
--- a/mm2src/coins_activation/Cargo.toml
+++ b/mm2src/coins_activation/Cargo.toml
@@ -8,7 +8,6 @@ doctest = false
[features]
enable-sia = []
-enable-solana = []
default = []
for-tests = []
diff --git a/mm2src/coins_activation/src/lib.rs b/mm2src/coins_activation/src/lib.rs
index 8a779b80f4..8020f91f27 100644
--- a/mm2src/coins_activation/src/lib.rs
+++ b/mm2src/coins_activation/src/lib.rs
@@ -10,20 +10,6 @@ mod platform_coin_with_tokens;
mod prelude;
#[cfg(feature = "enable-sia")] mod sia_coin_activation;
mod slp_token_activation;
-#[cfg(all(
- feature = "enable-solana",
- not(target_os = "ios"),
- not(target_os = "android"),
- not(target_arch = "wasm32")
-))]
-mod solana_with_tokens_activation;
-#[cfg(all(
- feature = "enable-solana",
- not(target_os = "ios"),
- not(target_os = "android"),
- not(target_arch = "wasm32")
-))]
-mod spl_token_activation;
mod standalone_coin;
mod tendermint_token_activation;
mod tendermint_with_assets_activation;
diff --git a/mm2src/coins_activation/src/solana_with_tokens_activation.rs b/mm2src/coins_activation/src/solana_with_tokens_activation.rs
deleted file mode 100644
index f411995779..0000000000
--- a/mm2src/coins_activation/src/solana_with_tokens_activation.rs
+++ /dev/null
@@ -1,327 +0,0 @@
-use crate::context::CoinsActivationContext;
-use crate::platform_coin_with_tokens::{EnablePlatformCoinWithTokensError, GetPlatformBalance,
- InitPlatformCoinWithTokensAwaitingStatus,
- InitPlatformCoinWithTokensInProgressStatus, InitPlatformCoinWithTokensTask,
- InitPlatformCoinWithTokensTaskManagerShared,
- InitPlatformCoinWithTokensUserAction, InitTokensAsMmCoinsError,
- PlatformCoinWithTokensActivationOps, RegisterTokenInfo, TokenActivationParams,
- TokenActivationRequest, TokenAsMmCoinInitializer, TokenInitializer, TokenOf};
-use crate::prelude::*;
-use crate::prelude::{CoinAddressInfo, TokenBalances, TryFromCoinProtocol, TxHistory};
-use crate::spl_token_activation::SplActivationRequest;
-use async_trait::async_trait;
-use coins::coin_errors::MyAddressError;
-use coins::my_tx_history_v2::TxHistoryStorage;
-use coins::solana::solana_coin_with_policy;
-use coins::solana::spl::{SplProtocolConf, SplTokenCreationError};
-use coins::{BalanceError, CoinBalance, CoinProtocol, DerivationMethodResponse, MarketCoinOps, MmCoinEnum,
- PrivKeyBuildPolicy, SolanaActivationParams, SolanaCoin, SplToken};
-use common::Future01CompatExt;
-use common::{drop_mutability, true_f};
-use crypto::CryptoCtxError;
-use futures::future::try_join_all;
-use mm2_core::mm_ctx::MmArc;
-use mm2_err_handle::prelude::*;
-use mm2_event_stream::EventStreamConfiguration;
-use mm2_number::BigDecimal;
-use rpc_task::RpcTaskHandleShared;
-use serde_derive::{Deserialize, Serialize};
-use serde_json::Value as Json;
-use std::collections::HashMap;
-
-pub struct SplTokenInitializer {
- platform_coin: SolanaCoin,
-}
-
-impl TokenOf for SplToken {
- type PlatformCoin = SolanaCoin;
-}
-
-pub struct SplTokenInitializerErr {
- ticker: String,
- inner: SplTokenCreationError,
-}
-
-#[async_trait]
-impl TokenInitializer for SplTokenInitializer {
- type Token = SplToken;
- type TokenActivationRequest = SplActivationRequest;
- type TokenProtocol = SplProtocolConf;
- type InitTokensError = SplTokenInitializerErr;
-
- fn tokens_requests_from_platform_request(
- platform_params: &SolanaWithTokensActivationRequest,
- ) -> Vec> {
- platform_params.spl_tokens_requests.clone()
- }
-
- async fn enable_tokens(
- &self,
- activation_params: Vec>,
- ) -> Result, MmError> {
- let tokens = activation_params
- .into_iter()
- .map(|param| {
- let ticker = param.ticker.clone();
- SplToken::new(
- param.protocol.decimals,
- param.ticker,
- param.protocol.token_contract_address,
- self.platform_coin.clone(),
- )
- .mm_err(|inner| SplTokenInitializerErr { ticker, inner })
- })
- .collect::, _>>()?;
- Ok(tokens)
- }
-
- fn platform_coin(&self) -> &SolanaCoin { &self.platform_coin }
-}
-
-impl RegisterTokenInfo for SolanaCoin {
- fn register_token_info(&self, token: &SplToken) { self.add_spl_token_info(token.ticker().into(), token.get_info()) }
-}
-
-#[derive(Clone, Debug, Deserialize)]
-pub struct SolanaWithTokensActivationRequest {
- #[serde(flatten)]
- platform_request: SolanaActivationParams,
- spl_tokens_requests: Vec>,
- #[serde(default = "true_f")]
- pub get_balances: bool,
-}
-
-impl TxHistory for SolanaWithTokensActivationRequest {
- fn tx_history(&self) -> bool { false }
-}
-
-impl ActivationRequestInfo for SolanaWithTokensActivationRequest {
- fn is_hw_policy(&self) -> bool { false } // TODO: fix when device policy is added
-}
-
-#[derive(Debug, Serialize, Clone)]
-pub struct SolanaWithTokensActivationResult {
- current_block: u64,
- solana_addresses_infos: HashMap>,
- spl_addresses_infos: HashMap>,
-}
-
-impl GetPlatformBalance for SolanaWithTokensActivationResult {
- fn get_platform_balance(&self) -> Option {
- self.solana_addresses_infos
- .iter()
- .fold(Some(BigDecimal::from(0)), |total, (_, addr_info)| {
- total.and_then(|t| addr_info.balances.as_ref().map(|b| t + b.get_total()))
- })
- }
-}
-
-impl CurrentBlock for SolanaWithTokensActivationResult {
- fn current_block(&self) -> u64 { self.current_block }
-}
-
-#[derive(Debug, Clone)]
-pub enum SolanaWithTokensActivationError {
- PlatformCoinCreationError { ticker: String, error: String },
- UnableToRetrieveMyAddress(String),
- GetBalanceError(BalanceError),
- Transport(String),
- Internal(String),
-}
-
-impl From for SolanaWithTokensActivationError {
- fn from(err: MyAddressError) -> Self { Self::UnableToRetrieveMyAddress(err.to_string()) }
-}
-
-impl From for EnablePlatformCoinWithTokensError {
- fn from(e: SolanaWithTokensActivationError) -> Self {
- match e {
- SolanaWithTokensActivationError::PlatformCoinCreationError { ticker, error } => {
- EnablePlatformCoinWithTokensError::PlatformCoinCreationError { ticker, error }
- },
- SolanaWithTokensActivationError::UnableToRetrieveMyAddress(e) => {
- EnablePlatformCoinWithTokensError::Internal(e)
- },
- SolanaWithTokensActivationError::GetBalanceError(e) => {
- EnablePlatformCoinWithTokensError::Internal(format!("{:?}", e))
- },
- SolanaWithTokensActivationError::Transport(e) => EnablePlatformCoinWithTokensError::Transport(e),
- SolanaWithTokensActivationError::Internal(e) => EnablePlatformCoinWithTokensError::Internal(e),
- }
- }
-}
-
-impl From for SolanaWithTokensActivationError {
- fn from(e: BalanceError) -> Self { SolanaWithTokensActivationError::GetBalanceError(e) }
-}
-
-impl From for SolanaWithTokensActivationError {
- fn from(e: CryptoCtxError) -> Self { SolanaWithTokensActivationError::Internal(e.to_string()) }
-}
-
-pub struct SolanaProtocolInfo {}
-
-impl TryFromCoinProtocol for SolanaProtocolInfo {
- fn try_from_coin_protocol(proto: CoinProtocol) -> Result>
- where
- Self: Sized,
- {
- match proto {
- CoinProtocol::SOLANA {} => Ok(SolanaProtocolInfo {}),
- protocol => MmError::err(protocol),
- }
- }
-}
-
-impl From for InitTokensAsMmCoinsError {
- fn from(err: SplTokenInitializerErr) -> Self {
- match err.inner {
- SplTokenCreationError::InvalidPubkey(error) => InitTokensAsMmCoinsError::TokenProtocolParseError {
- ticker: err.ticker,
- error,
- },
- SplTokenCreationError::Internal(internal) => InitTokensAsMmCoinsError::Internal(internal),
- }
- }
-}
-
-#[async_trait]
-impl PlatformCoinWithTokensActivationOps for SolanaCoin {
- type ActivationRequest = SolanaWithTokensActivationRequest;
- type PlatformProtocolInfo = SolanaProtocolInfo;
- type ActivationResult = SolanaWithTokensActivationResult;
- type ActivationError = SolanaWithTokensActivationError;
-
- type InProgressStatus = InitPlatformCoinWithTokensInProgressStatus;
- type AwaitingStatus = InitPlatformCoinWithTokensAwaitingStatus;
- type UserAction = InitPlatformCoinWithTokensUserAction;
-
- async fn enable_platform_coin(
- ctx: MmArc,
- ticker: String,
- platform_conf: &Json,
- activation_request: Self::ActivationRequest,
- _protocol_conf: Self::PlatformProtocolInfo,
- ) -> Result> {
- let priv_key_policy = PrivKeyBuildPolicy::detect_priv_key_policy(&ctx)?;
- solana_coin_with_policy(
- &ctx,
- &ticker,
- platform_conf,
- activation_request.platform_request,
- priv_key_policy,
- )
- .await
- .map_to_mm(|error| SolanaWithTokensActivationError::PlatformCoinCreationError { ticker, error })
- }
-
- async fn enable_global_nft(
- &self,
- _activation_request: &Self::ActivationRequest,
- ) -> Result, MmError> {
- Ok(None)
- }
-
- fn try_from_mm_coin(coin: MmCoinEnum) -> Option
- where
- Self: Sized,
- {
- match coin {
- MmCoinEnum::SolanaCoin(coin) => Some(coin),
- _ => None,
- }
- }
-
- fn token_initializers(
- &self,
- ) -> Vec>> {
- vec![Box::new(SplTokenInitializer {
- platform_coin: self.clone(),
- })]
- }
-
- async fn get_activation_result(
- &self,
- _task_handle: Option>>,
- activation_request: &Self::ActivationRequest,
- _nft_global: &Option,
- ) -> Result> {
- let current_block = self
- .current_block()
- .compat()
- .await
- .map_to_mm(Self::ActivationError::Internal)?;
-
- let my_address = self.my_address()?;
-
- let mut solana_address_info = CoinAddressInfo {
- derivation_method: DerivationMethodResponse::Iguana,
- pubkey: my_address.clone(),
- balances: None,
- tickers: None,
- };
-
- let mut spl_address_info = CoinAddressInfo {
- derivation_method: DerivationMethodResponse::Iguana,
- pubkey: my_address.clone(),
- balances: None,
- tickers: None,
- };
-
- if !activation_request.get_balances {
- drop_mutability!(solana_address_info);
- let tickers = self.get_spl_tokens_infos().into_keys().collect();
- spl_address_info.tickers = Some(tickers);
- drop_mutability!(spl_address_info);
-
- return Ok(SolanaWithTokensActivationResult {
- current_block,
- solana_addresses_infos: HashMap::from([(my_address.clone(), solana_address_info)]),
- spl_addresses_infos: HashMap::from([(my_address, spl_address_info)]),
- });
- }
-
- let solana_balance = self
- .my_balance()
- .compat()
- .await
- .map_err(|e| Self::ActivationError::GetBalanceError(e.into_inner()))?;
- solana_address_info.balances = Some(solana_balance);
- drop_mutability!(solana_address_info);
-
- let (token_tickers, requests): (Vec<_>, Vec<_>) = self
- .get_spl_tokens_infos()
- .into_iter()
- .map(|(ticker, info)| (ticker, self.my_balance_spl(info)))
- .unzip();
- spl_address_info.balances = Some(token_tickers.into_iter().zip(try_join_all(requests).await?).collect());
- drop_mutability!(spl_address_info);
-
- Ok(SolanaWithTokensActivationResult {
- current_block,
- solana_addresses_infos: HashMap::from([(my_address.clone(), solana_address_info)]),
- spl_addresses_infos: HashMap::from([(my_address, spl_address_info)]),
- })
- }
-
- fn start_history_background_fetching(
- &self,
- _ctx: MmArc,
- _storage: impl TxHistoryStorage + Send + 'static,
- _initial_balance: Option,
- ) {
- }
-
- async fn handle_balance_streaming(
- &self,
- _config: &EventStreamConfiguration,
- ) -> Result<(), MmError> {
- Ok(())
- }
-
- fn rpc_task_manager(
- _activation_ctx: &CoinsActivationContext,
- ) -> &InitPlatformCoinWithTokensTaskManagerShared {
- unimplemented!()
- }
-}
diff --git a/mm2src/coins_activation/src/spl_token_activation.rs b/mm2src/coins_activation/src/spl_token_activation.rs
deleted file mode 100644
index 2bf40b6a89..0000000000
--- a/mm2src/coins_activation/src/spl_token_activation.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-use crate::prelude::{TryFromCoinProtocol, TryPlatformCoinFromMmCoinEnum};
-use crate::token::{EnableTokenError, TokenActivationOps, TokenProtocolParams};
-use async_trait::async_trait;
-use coins::coin_errors::MyAddressError;
-use coins::solana::spl::{SplProtocolConf, SplTokenCreationError};
-use coins::{BalanceError, CoinBalance, CoinProtocol, MarketCoinOps, MmCoinEnum, SolanaCoin, SplToken};
-use common::Future01CompatExt;
-use mm2_err_handle::prelude::*;
-use serde_derive::{Deserialize, Serialize};
-use std::collections::HashMap;
-
-impl TryPlatformCoinFromMmCoinEnum for SolanaCoin {
- fn try_from_mm_coin(coin: MmCoinEnum) -> Option
- where
- Self: Sized,
- {
- match coin {
- MmCoinEnum::SolanaCoin(coin) => Some(coin),
- _ => None,
- }
- }
-}
-
-#[derive(Clone, Debug, Deserialize)]
-pub struct SplActivationRequest {}
-
-impl TryFromCoinProtocol for SplProtocolConf {
- fn try_from_coin_protocol(proto: CoinProtocol) -> Result>
- where
- Self: Sized,
- {
- match proto {
- CoinProtocol::SPLTOKEN {
- platform,
- token_contract_address,
- decimals,
- } => Ok(SplProtocolConf {
- platform_coin_ticker: platform,
- decimals,
- token_contract_address,
- }),
- proto => MmError::err(proto),
- }
- }
-}
-
-impl TokenProtocolParams for SplProtocolConf {
- fn platform_coin_ticker(&self) -> &str { &self.platform_coin_ticker }
-}
-
-#[derive(Debug, Serialize)]
-pub struct SplInitResult {
- balances: HashMap,
- token_contract_address: String,
- platform_coin: String,
-}
-
-#[derive(Debug)]
-#[allow(clippy::large_enum_variant)]
-pub enum SplInitError {
- GetBalanceError(BalanceError),
- TokenCreationFailed(SplTokenCreationError),
- MyAddressError(String),
-}
-
-impl From for SplInitError {
- fn from(err: MyAddressError) -> Self { Self::MyAddressError(err.to_string()) }
-}
-
-impl From for SplInitError {
- fn from(e: SplTokenCreationError) -> Self { SplInitError::TokenCreationFailed(e) }
-}
-
-impl From for EnableTokenError {
- fn from(err: SplInitError) -> Self {
- match err {
- SplInitError::GetBalanceError(rpc_err) => rpc_err.into(),
- SplInitError::TokenCreationFailed(e) => EnableTokenError::Internal(format! {"{:?}", e}),
- SplInitError::MyAddressError(e) => EnableTokenError::Internal(e),
- }
- }
-}
-
-#[async_trait]
-impl TokenActivationOps for SplToken {
- type ActivationParams = SplActivationRequest;
- type ProtocolInfo = SplProtocolConf;
- type ActivationResult = SplInitResult;
- type ActivationError = SplInitError;
-
- async fn enable_token(
- ticker: String,
- platform_coin: Self::PlatformCoin,
- _activation_params: Self::ActivationParams,
- protocol_conf: Self::ProtocolInfo,
- ) -> Result<(Self, Self::ActivationResult), MmError> {
- let token = Self::new(
- protocol_conf.decimals,
- ticker,
- protocol_conf.token_contract_address,
- platform_coin,
- )?;
- let balance = token
- .my_balance()
- .compat()
- .await
- .map_err(|e| SplInitError::GetBalanceError(e.into_inner()))?;
- let my_address = token.my_address()?;
- let balances = HashMap::from([(my_address, balance)]);
- let init_result = SplInitResult {
- balances,
- token_contract_address: token.conf.token_contract_address.to_string(),
- platform_coin: token.platform_coin.ticker().to_owned(),
- };
- Ok((token, init_result))
- }
-}
diff --git a/mm2src/common/common.rs b/mm2src/common/common.rs
index cf4fd6391d..019e06274c 100644
--- a/mm2src/common/common.rs
+++ b/mm2src/common/common.rs
@@ -519,19 +519,6 @@ pub fn set_panic_hook() {
}))
}
-/// Simulates the panic-in-panic crash.
-pub fn double_panic_crash() {
- struct Panicker;
- impl Drop for Panicker {
- fn drop(&mut self) { panic!("panic in drop") }
- }
- let panicker = Panicker;
- if 1 < 2 {
- panic!("first panic")
- }
- drop(panicker) // Delays the drop.
-}
-
/// RPC response, returned by the RPC handlers.
/// NB: By default the future is executed on the shared asynchronous reactor (`CORE`),
/// the handler is responsible for spawning the future on another reactor if it doesn't fit the `CORE` well.
@@ -635,7 +622,20 @@ pub fn var(name: &str) -> Result {
#[cfg(target_arch = "wasm32")]
pub fn var(_name: &str) -> Result { ERR!("Environment variable not supported in WASM") }
+/// Runs the given future on MM2's executor and waits for the result.
+///
+/// This is compatible with futures 0.1.
+pub fn block_on_f01(f: F) -> Result
+where
+ F: Future,
+{
+ block_on(f.compat())
+}
+
#[cfg(not(target_arch = "wasm32"))]
+/// Runs the given future on MM2's executor and waits for the result.
+///
+/// This is compatible with futures 0.3.
pub fn block_on(f: F) -> F::Output
where
F: Future03,
diff --git a/mm2src/common/expirable_map.rs b/mm2src/common/expirable_map.rs
index 9b85dea84c..996e2edfae 100644
--- a/mm2src/common/expirable_map.rs
+++ b/mm2src/common/expirable_map.rs
@@ -5,7 +5,7 @@
use instant::{Duration, Instant};
use rustc_hash::FxHashMap;
-use std::hash::Hash;
+use std::{collections::BTreeMap, hash::Hash};
#[derive(Clone, Debug)]
pub struct ExpirableEntry {
@@ -14,53 +14,105 @@ pub struct ExpirableEntry {
}
impl ExpirableEntry {
+ #[inline(always)]
+ pub fn new(v: V, exp: Duration) -> Self {
+ Self {
+ expires_at: Instant::now() + exp,
+ value: v,
+ }
+ }
+
+ #[inline(always)]
pub fn get_element(&self) -> &V { &self.value }
+ #[inline(always)]
+ pub fn update_value(&mut self, v: V) { self.value = v }
+
+ #[inline(always)]
pub fn update_expiration(&mut self, expires_at: Instant) { self.expires_at = expires_at }
+
+ /// Checks whether entry has longer ttl than the given one.
+ #[inline(always)]
+ pub fn has_longer_life_than(&self, min_ttl: Duration) -> bool { self.expires_at > Instant::now() + min_ttl }
}
-impl Default for ExpirableMap {
+impl Default for ExpirableMap {
fn default() -> Self { Self::new() }
}
/// A map that allows associating values with keys and expiring entries.
-/// It is important to note that this implementation does not automatically
-/// remove any entries; it is the caller's responsibility to invoke `clear_expired_entries`
-/// at specified intervals.
+/// It is important to note that this implementation does not have a background worker to
+/// automatically clear expired entries. Outdated entries are only removed when the control flow
+/// is handed back to the map mutably (i.e. some mutable method of the map is invoked).
///
/// WARNING: This is designed for performance-oriented use-cases utilizing `FxHashMap`
/// under the hood and is not suitable for cryptographic purposes.
#[derive(Clone, Debug)]
-pub struct ExpirableMap(FxHashMap>);
+pub struct ExpirableMap {
+ map: FxHashMap>,
+ /// A sorted inverse map from expiration times to keys to speed up expired entries clearing.
+ expiries: BTreeMap,
+}
-impl ExpirableMap {
+impl ExpirableMap {
/// Creates a new empty `ExpirableMap`
#[inline]
- pub fn new() -> Self { Self(FxHashMap::default()) }
+ pub fn new() -> Self {
+ Self {
+ map: FxHashMap::default(),
+ expiries: BTreeMap::new(),
+ }
+ }
- /// Returns the associated value if present.
+ /// Returns the associated value if present and not expired.
#[inline]
- pub fn get(&mut self, k: &K) -> Option<&V> { self.0.get(k).map(|v| &v.value) }
+ pub fn get(&self, k: &K) -> Option<&V> {
+ self.map
+ .get(k)
+ .filter(|v| v.expires_at > Instant::now())
+ .map(|v| &v.value)
+ }
+
+ /// Removes a key-value pair from the map and returns the associated value if present and not expired.
+ #[inline]
+ pub fn remove(&mut self, k: &K) -> Option {
+ self.map.remove(k).filter(|v| v.expires_at > Instant::now()).map(|v| {
+ self.expiries.remove(&v.expires_at);
+ v.value
+ })
+ }
/// Inserts a key-value pair with an expiration duration.
///
/// If a value already exists for the given key, it will be updated and then
/// the old one will be returned.
pub fn insert(&mut self, k: K, v: V, exp: Duration) -> Option {
- let entry = ExpirableEntry {
- expires_at: Instant::now() + exp,
- value: v,
- };
-
- self.0.insert(k, entry).map(|v| v.value)
+ self.clear_expired_entries();
+ let entry = ExpirableEntry::new(v, exp);
+ self.expiries.insert(entry.expires_at, k);
+ self.map.insert(k, entry).map(|v| v.value)
}
/// Removes expired entries from the map.
- pub fn clear_expired_entries(&mut self) { self.0.retain(|_k, v| Instant::now() < v.expires_at); }
-
- /// Removes a key-value pair from the map and returns the associated value if present.
- #[inline]
- pub fn remove(&mut self, k: &K) -> Option { self.0.remove(k).map(|v| v.value) }
+ ///
+ /// Iterates through the `expiries` in order, removing entries that have expired.
+ /// Stops at the first non-expired entry, leveraging the sorted nature of `BTreeMap`.
+ fn clear_expired_entries(&mut self) {
+ let now = Instant::now();
+
+ // `pop_first()` is used here as it efficiently removes expired entries.
+ // `first_key_value()` was considered as it wouldn't need re-insertion for
+ // non-expired entries, but it would require an extra remove operation for
+ // each expired entry. `pop_first()` needs only one re-insertion per call,
+ // which is an acceptable trade-off compared to multiple remove operations.
+ while let Some((exp, key)) = self.expiries.pop_first() {
+ if exp > now {
+ self.expiries.insert(exp, key);
+ break;
+ }
+ self.map.remove(&key);
+ }
+ }
}
#[cfg(any(test, target_arch = "wasm32"))]
@@ -80,8 +132,8 @@ mod tests {
let exp = Duration::from_secs(1);
// Insert 2 entries with 1 sec expiration time
- expirable_map.insert("key1".to_string(), value.to_string(), exp);
- expirable_map.insert("key2".to_string(), value.to_string(), exp);
+ expirable_map.insert("key1", value, exp);
+ expirable_map.insert("key2", value, exp);
// Wait for entries to expire
Timer::sleep(2.).await;
@@ -90,14 +142,14 @@ mod tests {
expirable_map.clear_expired_entries();
// We waited for 2 seconds, so we shouldn't have any entry accessible
- assert_eq!(expirable_map.0.len(), 0);
+ assert_eq!(expirable_map.map.len(), 0);
// Insert 5 entries
- expirable_map.insert("key1".to_string(), value.to_string(), Duration::from_secs(5));
- expirable_map.insert("key2".to_string(), value.to_string(), Duration::from_secs(4));
- expirable_map.insert("key3".to_string(), value.to_string(), Duration::from_secs(7));
- expirable_map.insert("key4".to_string(), value.to_string(), Duration::from_secs(2));
- expirable_map.insert("key5".to_string(), value.to_string(), Duration::from_millis(3750));
+ expirable_map.insert("key1", value, Duration::from_secs(5));
+ expirable_map.insert("key2", value, Duration::from_secs(4));
+ expirable_map.insert("key3", value, Duration::from_secs(7));
+ expirable_map.insert("key4", value, Duration::from_secs(2));
+ expirable_map.insert("key5", value, Duration::from_millis(3750));
// Wait 2 seconds to expire some entries
Timer::sleep(2.).await;
@@ -106,6 +158,6 @@ mod tests {
expirable_map.clear_expired_entries();
// We waited for 2 seconds, only one entry should expire
- assert_eq!(expirable_map.0.len(), 4);
+ assert_eq!(expirable_map.map.len(), 4);
});
}
diff --git a/mm2src/mm2_bin_lib/src/lib.rs b/mm2src/mm2_bin_lib/src/lib.rs
index 81c532419f..c78233e64a 100644
--- a/mm2src/mm2_bin_lib/src/lib.rs
+++ b/mm2src/mm2_bin_lib/src/lib.rs
@@ -99,5 +99,5 @@ fn prepare_for_mm2_stop() -> PrepareForStopResult {
async fn finalize_mm2_stop(ctx: MmArc) {
dispatch_lp_event(ctx.clone(), StopCtxEvent.into()).await;
- let _ = ctx.stop();
+ let _ = ctx.stop().await;
}
diff --git a/mm2src/mm2_core/Cargo.toml b/mm2src/mm2_core/Cargo.toml
index 943dcac280..a9d308be9a 100644
--- a/mm2src/mm2_core/Cargo.toml
+++ b/mm2src/mm2_core/Cargo.toml
@@ -20,6 +20,7 @@ lazy_static = "1.4"
mm2_err_handle = { path = "../mm2_err_handle" }
mm2_event_stream = { path = "../mm2_event_stream" }
mm2_metrics = { path = "../mm2_metrics" }
+mm2_libp2p = { path = "../mm2_p2p", package = "mm2_p2p" }
primitives = { path = "../mm2_bitcoin/primitives" }
rand = { version = "0.7", features = ["std", "small_rng", "wasm-bindgen"] }
serde = "1"
diff --git a/mm2src/mm2_core/src/data_asker.rs b/mm2src/mm2_core/src/data_asker.rs
index 5d01310630..7f32f93365 100644
--- a/mm2src/mm2_core/src/data_asker.rs
+++ b/mm2src/mm2_core/src/data_asker.rs
@@ -113,8 +113,6 @@ pub async fn send_asked_data_rpc(
asked_data: SendAskedDataRequest,
) -> Result> {
let mut awaiting_asks = ctx.data_asker.awaiting_asks.lock().await;
- awaiting_asks.clear_expired_entries();
-
match awaiting_asks.remove(&asked_data.data_id) {
Some(sender) => {
sender.send(asked_data.data).map_to_mm(|_| {
diff --git a/mm2src/mm2_core/src/lib.rs b/mm2src/mm2_core/src/lib.rs
index 62e4bef09c..88b0fd5c81 100644
--- a/mm2src/mm2_core/src/lib.rs
+++ b/mm2src/mm2_core/src/lib.rs
@@ -1,10 +1,11 @@
-use derive_more::Display;
-use rand::{thread_rng, Rng};
+#[cfg(target_arch = "wasm32")] use derive_more::Display;
+#[cfg(target_arch = "wasm32")] use rand::{thread_rng, Rng};
pub mod data_asker;
pub mod event_dispatcher;
pub mod mm_ctx;
+#[cfg(target_arch = "wasm32")]
#[derive(Clone, Copy, Display, PartialEq, Default)]
pub enum DbNamespaceId {
#[display(fmt = "MAIN")]
@@ -14,9 +15,13 @@ pub enum DbNamespaceId {
Test(u64),
}
+#[cfg(target_arch = "wasm32")]
impl DbNamespaceId {
pub fn for_test() -> DbNamespaceId {
let mut rng = thread_rng();
DbNamespaceId::Test(rng.gen())
}
+
+ #[inline(always)]
+ pub fn for_test_with_id(id: u64) -> DbNamespaceId { DbNamespaceId::Test(id) }
}
diff --git a/mm2src/mm2_core/src/mm_ctx.rs b/mm2src/mm2_core/src/mm_ctx.rs
index e891f0b649..3f56970f3c 100644
--- a/mm2src/mm2_core/src/mm_ctx.rs
+++ b/mm2src/mm2_core/src/mm_ctx.rs
@@ -1,12 +1,16 @@
#[cfg(feature = "track-ctx-pointer")]
use common::executor::Timer;
-use common::executor::{abortable_queue::{AbortableQueue, WeakSpawner},
- graceful_shutdown, AbortSettings, AbortableSystem, SpawnAbortable, SpawnFuture};
use common::log::{self, LogLevel, LogOnError, LogState};
use common::{cfg_native, cfg_wasm32, small_rng};
+use common::{executor::{abortable_queue::{AbortableQueue, WeakSpawner},
+ graceful_shutdown, AbortSettings, AbortableSystem, SpawnAbortable, SpawnFuture},
+ expirable_map::ExpirableMap};
+use futures::channel::oneshot;
+use futures::lock::Mutex as AsyncMutex;
use gstuff::{try_s, Constructible, ERR, ERRL};
use lazy_static::lazy_static;
use mm2_event_stream::{controller::Controller, Event, EventStreamConfiguration};
+use mm2_libp2p::PeerAddress;
use mm2_metrics::{MetricsArc, MetricsOps};
use primitives::hash::H160;
use rand::Rng;
@@ -30,7 +34,6 @@ cfg_wasm32! {
cfg_native! {
use db_common::async_sql_conn::AsyncConnection;
use db_common::sqlite::rusqlite::Connection;
- use futures::lock::Mutex as AsyncMutex;
use rustls::ServerName;
use mm2_metrics::prometheus;
use mm2_metrics::MmMetricsError;
@@ -142,6 +145,8 @@ pub struct MmCtx {
/// asynchronous handle for rusqlite connection.
#[cfg(not(target_arch = "wasm32"))]
pub async_sqlite_connection: Constructible>>,
+ /// Links the RPC context to the P2P context to handle health check responses.
+ pub healthcheck_response_handler: AsyncMutex>>,
}
impl MmCtx {
@@ -191,6 +196,7 @@ impl MmCtx {
nft_ctx: Mutex::new(None),
#[cfg(not(target_arch = "wasm32"))]
async_sqlite_connection: Constructible::default(),
+ healthcheck_response_handler: AsyncMutex::new(ExpirableMap::default()),
}
}
@@ -287,10 +293,12 @@ impl MmCtx {
})
}
+ /// Returns the path to the MM databases root.
+ #[cfg(not(target_arch = "wasm32"))]
+ pub fn db_root(&self) -> PathBuf { path_to_db_root(self.conf["dbdir"].as_str()) }
#[cfg(not(target_arch = "wasm32"))]
pub fn wallet_file_path(&self, wallet_name: &str) -> PathBuf {
- let db_root = path_to_db_root(self.conf["dbdir"].as_str());
- db_root.join(wallet_name.to_string() + ".dat")
+ self.db_root().join(wallet_name.to_string() + ".dat")
}
/// MM database path.
@@ -500,7 +508,10 @@ lazy_static! {
impl MmArc {
pub fn new(ctx: MmCtx) -> MmArc { MmArc(SharedRc::new(ctx)) }
- pub fn stop(&self) -> Result<(), String> {
+ pub async fn stop(&self) -> Result<(), String> {
+ #[cfg(not(target_arch = "wasm32"))]
+ try_s!(self.close_async_connection().await);
+
try_s!(self.stop.pin(true));
// Notify shutdown listeners.
@@ -514,6 +525,16 @@ impl MmArc {
Ok(())
}
+ #[cfg(not(target_arch = "wasm32"))]
+ async fn close_async_connection(&self) -> Result<(), db_common::async_sql_conn::AsyncConnError> {
+ if let Some(async_conn) = self.async_sqlite_connection.as_option() {
+ let mut conn = async_conn.lock().await;
+ conn.close().await?;
+ }
+
+ Ok(())
+ }
+
#[cfg(feature = "track-ctx-pointer")]
fn track_ctx_pointer(&self) {
let ctx_weak = self.weak();
@@ -737,6 +758,12 @@ impl MmCtxBuilder {
self
}
+ #[cfg(target_arch = "wasm32")]
+ pub fn with_test_db_namespace_with_id(mut self, id: u64) -> Self {
+ self.db_namespace = DbNamespaceId::for_test_with_id(id);
+ self
+ }
+
pub fn into_mm_arc(self) -> MmArc {
// NB: We avoid recreating LogState
// in order not to interfere with the integration tests checking LogState drop on shutdown.
diff --git a/mm2src/mm2_err_handle/src/map_to_mm_fut.rs b/mm2src/mm2_err_handle/src/map_to_mm_fut.rs
index 01de1b7d7e..0cfeb9cf13 100644
--- a/mm2src/mm2_err_handle/src/map_to_mm_fut.rs
+++ b/mm2src/mm2_err_handle/src/map_to_mm_fut.rs
@@ -21,7 +21,7 @@ where
///
/// ```rust
/// let fut = futures01::future::err("An error".to_owned());
- /// let mapped_res: Result<(), MmError> = fut.map_to_mm_fut(|e| e.len()).wait();
+ /// let mapped_res: Result<(), MmError> = block_on_f01(fut.map_to_mm_fut(|e| e.len()));
/// ```
#[track_caller]
fn map_to_mm_fut(self, f: F) -> MapToMmFuture<'a, T, E1, E2>
diff --git a/mm2src/mm2_err_handle/src/mm_error.rs b/mm2src/mm2_err_handle/src/mm_error.rs
index 56e7f29f50..1ea7bf1555 100644
--- a/mm2src/mm2_err_handle/src/mm_error.rs
+++ b/mm2src/mm2_err_handle/src/mm_error.rs
@@ -332,6 +332,7 @@ impl FormattedTrace for Vec {
mod tests {
use super::*;
use crate::prelude::*;
+ use common::block_on_f01;
use futures01::Future;
use ser_error_derive::SerializeErrorType;
use serde_json::{self as json, json};
@@ -425,10 +426,8 @@ mod tests {
}
let into_mm_line = line!() + 2;
- let mm_err = generate_error("An error")
- .map_to_mm_fut(|error| error.len())
- .wait()
- .expect_err("Expected an error");
+ let mm_err =
+ block_on_f01(generate_error("An error").map_to_mm_fut(|error| error.len())).expect_err("Expected an error");
assert_eq!(mm_err.etype, 8);
assert_eq!(mm_err.trace, vec![TraceLocation::new("mm_error", into_mm_line)]);
}
diff --git a/mm2src/mm2_io/src/fs.rs b/mm2src/mm2_io/src/fs.rs
index 94a323c0b8..489b3bad8b 100644
--- a/mm2src/mm2_io/src/fs.rs
+++ b/mm2src/mm2_io/src/fs.rs
@@ -192,19 +192,52 @@ where
json::from_slice(&content).map_to_mm(FsJsonError::Deserializing)
}
-/// Read the `dir_path` entries trying to deserialize each as the `T` type.
+async fn filter_files_by_extension(dir_path: &Path, extension: &str) -> IoResult> {
+ let ext = Some(OsStr::new(extension).to_ascii_lowercase());
+ let entries = read_dir_async(dir_path)
+ .await?
+ .into_iter()
+ .filter(|path| path.extension().map(|ext| ext.to_ascii_lowercase()) == ext)
+ .collect();
+ Ok(entries)
+}
+
+/// Helper function to extract file names or stems based on the provided extraction function.
+fn extract_file_identifiers<'a, F>(entries: Vec, extractor: F) -> impl Iterator- + 'a
+where
+ F: Fn(&Path) -> Option<&OsStr> + 'a,
+{
+ entries
+ .into_iter()
+ .filter_map(move |path| extractor(&path).and_then(OsStr::to_str).map(ToOwned::to_owned))
+}
+
+/// Lists files by the specified extension from the given directory path.
+/// If include_extension is true, returns full file names; otherwise, returns file stems.
+pub async fn list_files_by_extension(
+ dir_path: &Path,
+ extension: &str,
+ include_extension: bool,
+) -> IoResult> {
+ let entries = filter_files_by_extension(dir_path, extension).await?;
+ let extractor = if include_extension {
+ Path::file_name
+ } else {
+ Path::file_stem
+ };
+ Ok(extract_file_identifiers(entries, extractor))
+}
+
+/// Read the `dir_path` entries trying to deserialize each as the `T` type,
+/// filtering by the specified extension.
/// Please note that files that couldn't be deserialized are skipped.
-pub async fn read_dir_json(dir_path: &Path) -> FsJsonResult>
+pub async fn read_files_with_extension(dir_path: &Path, extension: &str) -> FsJsonResult>
where
T: DeserializeOwned,
{
- let json_ext = Some(OsStr::new("json"));
- let entries: Vec<_> = read_dir_async(dir_path)
+ let entries = filter_files_by_extension(dir_path, extension)
.await
- .mm_err(FsJsonError::IoReading)?
- .into_iter()
- .filter(|path| path.extension() == json_ext)
- .collect();
+ .mm_err(FsJsonError::IoReading)?;
let type_name = std::any::type_name::();
let mut result = Vec::new();
@@ -233,6 +266,16 @@ where
Ok(result)
}
+/// Read the `dir_path` entries trying to deserialize each as the `T` type from JSON files.
+/// Please note that files that couldn't be deserialized are skipped.
+#[inline(always)]
+pub async fn read_dir_json(dir_path: &Path) -> FsJsonResult>
+where
+ T: DeserializeOwned,
+{
+ read_files_with_extension(dir_path, "json").await
+}
+
pub async fn write_json(t: &T, path: &Path, use_tmp_file: bool) -> FsJsonResult<()>
where
T: Serialize,
diff --git a/mm2src/mm2_main/Cargo.toml b/mm2src/mm2_main/Cargo.toml
index ace4369c6e..6eff9e9923 100644
--- a/mm2src/mm2_main/Cargo.toml
+++ b/mm2src/mm2_main/Cargo.toml
@@ -18,8 +18,6 @@ native = [] # Deprecated
track-ctx-pointer = ["common/track-ctx-pointer"]
zhtlc-native-tests = ["coins/zhtlc-native-tests"]
run-docker-tests = ["coins/run-docker-tests"]
-# TODO
-enable-solana = ["coins/enable-solana", "coins_activation/enable-solana"]
default = []
trezor-udp = ["crypto/trezor-udp"] # use for tests to connect to trezor emulator over udp
run-device-tests = []
@@ -32,6 +30,7 @@ bitcrypto = { path = "../mm2_bitcoin/crypto" }
blake2 = "0.10.6"
bytes = "0.4"
chain = { path = "../mm2_bitcoin/chain" }
+chrono = "0.4"
cfg-if = "1.0"
coins = { path = "../coins" }
coins_activation = { path = "../coins_activation" }
@@ -64,7 +63,7 @@ mm2_err_handle = { path = "../mm2_err_handle" }
mm2_event_stream = { path = "../mm2_event_stream" }
mm2_gui_storage = { path = "../mm2_gui_storage" }
mm2_io = { path = "../mm2_io" }
-mm2-libp2p = { path = "../mm2_p2p", package = "mm2_p2p" }
+mm2_libp2p = { path = "../mm2_p2p", package = "mm2_p2p" }
mm2_metrics = { path = "../mm2_metrics" }
mm2_net = { path = "../mm2_net", features = ["event-stream", "p2p"] }
mm2_number = { path = "../mm2_number" }
@@ -76,12 +75,9 @@ parity-util-mem = "0.11"
parking_lot = { version = "0.12.0", features = ["nightly"] }
primitives = { path = "../mm2_bitcoin/primitives" }
primitive-types = "0.11.1"
-prost = "0.11"
+prost = "0.12"
rand = { version = "0.7", features = ["std", "small_rng"] }
rand6 = { version = "0.6", package = "rand" }
-# TODO: Reduce the size of regex by disabling the features we don't use.
-# cf. https://github.com/rust-lang/regex/issues/583
-regex = "1"
rmp-serde = "0.14.3"
rpc = { path = "../mm2_bitcoin/rpc" }
rpc_task = { path = "../rpc_task" }
@@ -118,7 +114,7 @@ hyper = { version = "0.14.26", features = ["client", "http2", "server", "tcp"] }
rcgen = "0.10"
rustls = { version = "0.21", default-features = false }
rustls-pemfile = "1.0.2"
-tokio = { version = "1.20", features = ["io-util", "rt-multi-thread", "net"] }
+tokio = { version = "1.20", features = ["io-util", "rt-multi-thread", "net", "signal"] }
[target.'cfg(windows)'.dependencies]
winapi = "0.3"
@@ -140,5 +136,5 @@ url = { version = "2.2.2", features = ["serde"] }
[build-dependencies]
chrono = "0.4"
gstuff = { version = "0.7", features = ["nightly"] }
-prost-build = { version = "0.11", default-features = false }
+prost-build = { version = "0.12", default-features = false }
regex = "1"
diff --git a/mm2src/mm2_main/src/for_tests/iris_nimda_rick_taker_swap.json b/mm2src/mm2_main/src/for_tests/iris_nimda_rick_taker_swap.json
index b040229f93..93cab41558 100644
--- a/mm2src/mm2_main/src/for_tests/iris_nimda_rick_taker_swap.json
+++ b/mm2src/mm2_main/src/for_tests/iris_nimda_rick_taker_swap.json
@@ -145,12 +145,14 @@
"Started",
"Negotiated",
"TakerFeeSent",
+ "TakerPaymentInstructionsReceived",
"MakerPaymentReceived",
"MakerPaymentWaitConfirmStarted",
"MakerPaymentValidatedAndConfirmed",
"TakerPaymentSent",
"TakerPaymentSpent",
"MakerPaymentSpent",
+ "MakerPaymentSpendConfirmed",
"Finished"
],
"error_events": [
@@ -164,8 +166,12 @@
"TakerPaymentDataSendFailed",
"TakerPaymentWaitForSpendFailed",
"MakerPaymentSpendFailed",
+ "MakerPaymentSpendConfirmFailed",
"TakerPaymentWaitRefundStarted",
+ "TakerPaymentRefundStarted",
"TakerPaymentRefunded",
- "TakerPaymentRefundFailed"
+ "TakerPaymentRefundedByWatcher",
+ "TakerPaymentRefundFailed",
+ "TakerPaymentRefundFinished"
]
}
\ No newline at end of file
diff --git a/mm2src/mm2_main/src/for_tests/recreate_maker_swap_maker_payment_wait_confirm_failed_taker_saved.json b/mm2src/mm2_main/src/for_tests/recreate_maker_swap_maker_payment_wait_confirm_failed_taker_saved.json
index 07ebe0d6b9..73261f641e 100644
--- a/mm2src/mm2_main/src/for_tests/recreate_maker_swap_maker_payment_wait_confirm_failed_taker_saved.json
+++ b/mm2src/mm2_main/src/for_tests/recreate_maker_swap_maker_payment_wait_confirm_failed_taker_saved.json
@@ -49,6 +49,6 @@
"taker_coin":"MORTY",
"gui":"atomicDEX 0.5.1 iOS",
"mm_version":"1b065636a",
- "success_events":["Started","Negotiated","TakerFeeSent","TakerPaymentInstructionsReceived","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","Finished"],
+ "success_events":["Started","Negotiated","TakerFeeSent","TakerPaymentInstructionsReceived","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","MakerPaymentSpendConfirmed","Finished"],
"error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","MakerPaymentWaitConfirmFailed","TakerPaymentTransactionFailed","TakerPaymentWaitConfirmFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","TakerPaymentWaitRefundStarted","TakerPaymentRefunded","TakerPaymentRefundedByWatcher","TakerPaymentRefundFailed"]
}
\ No newline at end of file
diff --git a/mm2src/mm2_main/src/for_tests/recreate_maker_swap_taker_saved.json b/mm2src/mm2_main/src/for_tests/recreate_maker_swap_taker_saved.json
index 8fe8622f74..a3158581c6 100644
--- a/mm2src/mm2_main/src/for_tests/recreate_maker_swap_taker_saved.json
+++ b/mm2src/mm2_main/src/for_tests/recreate_maker_swap_taker_saved.json
@@ -61,6 +61,6 @@
"taker_coin":"MORTY",
"gui":"atomicDEX 0.5.1 iOS",
"mm_version":"1b065636a",
- "success_events":["Started","Negotiated","TakerFeeSent","TakerPaymentInstructionsReceived","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","Finished"],
+ "success_events":["Started","Negotiated","TakerFeeSent","TakerPaymentInstructionsReceived","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","MakerPaymentSpendConfirmed","Finished"],
"error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","MakerPaymentWaitConfirmFailed","TakerPaymentTransactionFailed","TakerPaymentWaitConfirmFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","TakerPaymentWaitRefundStarted","TakerPaymentRefunded","TakerPaymentRefundedByWatcher","TakerPaymentRefundFailed"]
}
\ No newline at end of file
diff --git a/mm2src/mm2_main/src/for_tests/recreate_taker_swap_taker_expected.json b/mm2src/mm2_main/src/for_tests/recreate_taker_swap_taker_expected.json
index cfb9ab66f8..1c1cc39acf 100644
--- a/mm2src/mm2_main/src/for_tests/recreate_taker_swap_taker_expected.json
+++ b/mm2src/mm2_main/src/for_tests/recreate_taker_swap_taker_expected.json
@@ -57,6 +57,6 @@
"taker_coin":"MORTY",
"gui":null,
"mm_version":"",
- "success_events":["Started","Negotiated","TakerFeeSent","TakerPaymentInstructionsReceived","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","Finished"],
- "error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","MakerPaymentWaitConfirmFailed","TakerPaymentTransactionFailed","TakerPaymentWaitConfirmFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","TakerPaymentWaitRefundStarted","TakerPaymentRefundStarted","TakerPaymentRefunded","TakerPaymentRefundedByWatcher","TakerPaymentRefundFailed","TakerPaymentRefundFinished"]
+ "success_events":["Started","Negotiated","TakerFeeSent","TakerPaymentInstructionsReceived","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","MakerPaymentSpendConfirmed","Finished"],
+ "error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","MakerPaymentWaitConfirmFailed","TakerPaymentTransactionFailed","TakerPaymentWaitConfirmFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","MakerPaymentSpendConfirmFailed","TakerPaymentWaitRefundStarted","TakerPaymentRefundStarted","TakerPaymentRefunded","TakerPaymentRefundedByWatcher","TakerPaymentRefundFailed","TakerPaymentRefundFinished"]
}
\ No newline at end of file
diff --git a/mm2src/mm2_main/src/for_tests/recreate_taker_swap_taker_payment_wait_confirm_failed_taker_expected.json b/mm2src/mm2_main/src/for_tests/recreate_taker_swap_taker_payment_wait_confirm_failed_taker_expected.json
index cb3146b2a3..e743669805 100644
--- a/mm2src/mm2_main/src/for_tests/recreate_taker_swap_taker_payment_wait_confirm_failed_taker_expected.json
+++ b/mm2src/mm2_main/src/for_tests/recreate_taker_swap_taker_payment_wait_confirm_failed_taker_expected.json
@@ -53,6 +53,6 @@
"taker_coin":"MORTY",
"gui":null,
"mm_version":"",
- "success_events":["Started","Negotiated","TakerFeeSent","TakerPaymentInstructionsReceived","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","Finished"],
- "error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","MakerPaymentWaitConfirmFailed","TakerPaymentTransactionFailed","TakerPaymentWaitConfirmFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","TakerPaymentWaitRefundStarted","TakerPaymentRefundStarted","TakerPaymentRefunded","TakerPaymentRefundedByWatcher","TakerPaymentRefundFailed","TakerPaymentRefundFinished"]
+ "success_events":["Started","Negotiated","TakerFeeSent","TakerPaymentInstructionsReceived","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","MakerPaymentSpendConfirmed","Finished"],
+ "error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","MakerPaymentWaitConfirmFailed","TakerPaymentTransactionFailed","TakerPaymentWaitConfirmFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","MakerPaymentSpendConfirmFailed","TakerPaymentWaitRefundStarted","TakerPaymentRefundStarted","TakerPaymentRefunded","TakerPaymentRefundedByWatcher","TakerPaymentRefundFailed","TakerPaymentRefundFinished"]
}
\ No newline at end of file
diff --git a/mm2src/mm2_main/src/lp_healthcheck.rs b/mm2src/mm2_main/src/lp_healthcheck.rs
new file mode 100644
index 0000000000..849f478d5f
--- /dev/null
+++ b/mm2src/mm2_main/src/lp_healthcheck.rs
@@ -0,0 +1,447 @@
+use async_std::prelude::FutureExt;
+use chrono::Utc;
+use common::executor::SpawnFuture;
+use common::expirable_map::ExpirableEntry;
+use common::{log, HttpStatusCode, StatusCode};
+use derive_more::Display;
+use futures::channel::oneshot::{self, Receiver, Sender};
+use instant::{Duration, Instant};
+use lazy_static::lazy_static;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::MmError;
+use mm2_libp2p::{decode_message, encode_message, pub_sub_topic, Libp2pPublic, PeerAddress, TopicPrefix};
+use mm2_net::p2p::P2PContext;
+use ser_error_derive::SerializeErrorType;
+use serde::{Deserialize, Serialize};
+use std::convert::TryFrom;
+use std::sync::Mutex;
+
+use crate::lp_network::broadcast_p2p_msg;
+
+pub(crate) const PEER_HEALTHCHECK_PREFIX: TopicPrefix = "hcheck";
+
+const fn healthcheck_message_exp_secs() -> u64 {
+ #[cfg(test)]
+ return 3;
+
+ #[cfg(not(test))]
+ 10
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[cfg_attr(any(test, target_arch = "wasm32"), derive(PartialEq))]
+pub(crate) struct HealthcheckMessage {
+ #[serde(deserialize_with = "deserialize_bytes")]
+ signature: Vec,
+ data: HealthcheckData,
+}
+
+#[derive(Debug, Display)]
+enum SignValidationError {
+ #[display(
+ fmt = "Healthcheck message is expired. Current time in UTC: {now_secs}, healthcheck `expires_at` in UTC: {expires_at_secs}"
+ )]
+ Expired { now_secs: u64, expires_at_secs: u64 },
+ #[display(
+ fmt = "Healthcheck message have too high expiration time. Max allowed expiration seconds: {max_allowed_expiration_secs}, received message expiration seconds: {remaining_expiration_secs}"
+ )]
+ LifetimeOverflow {
+ max_allowed_expiration_secs: u64,
+ remaining_expiration_secs: u64,
+ },
+ #[display(fmt = "Public key is not valid.")]
+ InvalidPublicKey,
+ #[display(fmt = "Signature integrity doesn't match with the public key.")]
+ FakeSignature,
+ #[display(fmt = "Process failed unexpectedly due to this reason: {reason}")]
+ Internal { reason: String },
+}
+
+impl HealthcheckMessage {
+ pub(crate) fn generate_message(ctx: &MmArc, is_a_reply: bool) -> Result